commit 0cedba16b863ff6084e041dd44b075fd764cd911 · pyrox.dev/nixpkgs

+1

lib/maintainers.nix

···

       145
       145
        
         DamienCassou = "Damien Cassou <damien@cassou.me>";

     

       146
       146
        
         danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";

     

       147
       147
        
         dancek = "Hannu Hartikainen <hannu.hartikainen@gmail.com>";

     

       148
       148
       +
         danharaj = "Dan Haraj <dan@obsidian.systems>";

     

       148
       149
        
         danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>";

     

       149
       150
        
         dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";

     

       150
       151
        
         david50407 = "David Kuo <me@davy.tw>";

+6 -1

pkgs/applications/science/machine-learning/sc2-headless/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       +
       , callPackage

     

       2
       3
        
       , lib

     

       3
       4
        
       , fetchurl

     

       4
       5
        
       , unzip

     
···

       11
       12
        
           by setting nixpkgs config option 'sc2-headless.accept_license = true;'

     

       12
       13
        
         ''

     

       13
       14
        
       else assert licenseAccepted;

     

       14
       14
       -
       stdenv.mkDerivation rec {

     

       15
       15
       +
       let maps = callPackage ./maps.nix {};

     

       16
       16
       +
       in stdenv.mkDerivation rec {

     

       15
       17
        
         version = "3.17";

     

       16
       18
        
         name = "sc2-headless-${version}";

     

       17
       19
        
       

     
···

       30
       32
        
           mkdir -p $out

     

       31
       33
        
           cp -r . "$out"

     

       32
       34
        
           rm -r $out/Libs

     

       35
       35
       +
       

     

       36
       36
       +
           cp -r "${maps.minigames}"/* "$out"/Maps/

     

       33
       37
        
         '';

     

       34
       38
        
       

     

       35
       39
        
         preFixup = ''

     
···

       50
       54
        
             url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html";

     

       51
       55
        
             free = false;

     

       52
       56
        
           };

     

       57
       57
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       53
       58
        
         };

     

       54
       59
        
       }

+11

pkgs/applications/science/machine-learning/sc2-headless/maps.nix

···

       1
       1
       +
       { fetchzip

     

       2
       2
       +
       }:

     

       3
       3
       +
       

     

       4
       4
       +
       {

     

       5
       5
       +
         minigames = fetchzip {

     

       6
       6
       +
           url = "https://github.com/deepmind/pysc2/releases/download/v1.2/mini_games.zip";

     

       7
       7
       +
           sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla";

     

       8
       8
       +
           stripRoot = false;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
       }

+28

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , six

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "absl-py";

     

       9
       9
       +
         version = "0.1.3";

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "017wc85i7l3vpjzw3shgb7k7n0jfid88g09dlf1kgdy4ll0sjfax";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [ six ];

     

       18
       18
       +
       

     

       19
       19
       +
         # checks use bazel; should be revisited

     

       20
       20
       +
         doCheck = false;

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "Abseil Python Common Libraries";

     

       24
       24
       +
           homepage = "https://github.com/abseil/abseil-py";

     

       25
       25
       +
           license = lib.licenses.asl20;

     

       26
       26
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+22

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "mpyq";

     

       8
       8
       +
         version = "0.2.5";

     

       9
       9
       +
         name = "${pname}-${version}";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "01q0xh2fy3zzsrfr45d2ypj4whs7s060cy1rnprg6sg55fbgbaih";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           description = "A Python library for extracting MPQ (MoPaQ) files.";

     

       18
       18
       +
           homepage = "https://github.com/eagleflo/mpyq";

     

       19
       19
       +
           license = lib.licenses.bsd2;

     

       20
       20
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+22

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "portpicker";

     

       8
       8
       +
         version = "1.2.0";

     

       9
       9
       +
         name = "${pname}-${version}";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           description = "A library to choose unique available network ports.";

     

       18
       18
       +
           homepage = "https://github.com/google/python_portpicker";

     

       19
       19
       +
           license = lib.licenses.asl20;

     

       20
       20
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+64

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , absl-py

     

       5
       5
       +
       , enum34

     

       6
       6
       +
       , future

     

       7
       7
       +
       , futures

     

       8
       8
       +
       , mock

     

       9
       9
       +
       , mpyq

     

       10
       10
       +
       , numpy

     

       11
       11
       +
       , portpicker

     

       12
       12
       +
       , protobuf

     

       13
       13
       +
       , pygame

     

       14
       14
       +
       , s2clientprotocol

     

       15
       15
       +
       , six

     

       16
       16
       +
       , websocket_client

     

       17
       17
       +
       , sc2-headless

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       buildPythonPackage rec {

     

       21
       21
       +
         version = "1.2";

     

       22
       22
       +
         name = "PySC2-${version}";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "deepmind";

     

       26
       26
       +
           repo = "pysc2";

     

       27
       27
       +
           rev = "39f84b01d662eb58b3d95791f59208c210afd4e7";

     

       28
       28
       +
           sha256 = "0dfbc2krd2rys1ji75ng2nl0ki8nhnylxljcp287bfb8qyz2m25p";

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         patches = [

     

       32
       32
       +
           ./fix-setup-for-py3.patch

     

       33
       33
       +
           ./parameterize-runconfig-sc2path.patch

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           substituteInPlace "./pysc2/run_configs/platforms.py" \

     

       38
       38
       +
             --subst-var-by 'sc2path' '${sc2-headless}'

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         propagatedBuildInputs = [

     

       42
       42
       +
           absl-py

     

       43
       43
       +
           enum34

     

       44
       44
       +
           future

     

       45
       45
       +
           mock

     

       46
       46
       +
           mpyq

     

       47
       47
       +
           numpy

     

       48
       48
       +
           portpicker

     

       49
       49
       +
           protobuf

     

       50
       50
       +
           pygame

     

       51
       51
       +
           s2clientprotocol

     

       52
       52
       +
           six

     

       53
       53
       +
           websocket_client

     

       54
       54
       +
           sc2-headless

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       57
       57
       +
         meta = {

     

       58
       58
       +
           description = "Starcraft II environment and library for training agents.";

     

       59
       59
       +
           homepage = "https://github.com/deepmind/pysc2";

     

       60
       60
       +
           license = lib.licenses.asl20;

     

       61
       61
       +
           platforms = lib.platforms.linux;

     

       62
       62
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       63
       63
       +
         };

     

       64
       64
       +
       }

+64

pkgs/development/python-modules/pysc2/fix-setup-for-py3.patch

···

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

     

       2
       2
       +
       index 020768f..13c2b67 100755

     

       3
       3
       +
       --- a/setup.py

     

       4
       4
       +
       +++ b/setup.py

     

       5
       5
       +
       @@ -17,6 +17,8 @@ from __future__ import absolute_import

     

       6
       6
       +
        from __future__ import division

     

       7
       7
       +
        from __future__ import print_function

     

       8
       8
       +
        

     

       9
       9
       +
       +import sys

     

       10
       10
       +
       +

     

       11
       11
       +
        from setuptools import setup

     

       12
       12
       +
        

     

       13
       13
       +
        description = """PySC2 - StarCraft II Learning Environment

     

       14
       14
       +
       @@ -36,6 +38,27 @@ some initial research results using the environment.

     

       15
       15
       +
        Read the README at https://github.com/deepmind/pysc2 for more information.

     

       16
       16
       +
        """

     

       17
       17
       +
        

     

       18
       18
       +
       +requires = [

     

       19
       19
       +
       +    'absl-py>=0.1.0',

     

       20
       20
       +
       +    'future',

     

       21
       21
       +
       +    'mock',

     

       22
       22
       +
       +    'mpyq',

     

       23
       23
       +
       +    'numpy>=1.10',

     

       24
       24
       +
       +    'portpicker>=1.2.0',

     

       25
       25
       +
       +    'protobuf>=2.6',

     

       26
       26
       +
       +    'pygame',

     

       27
       27
       +
       +    's2clientprotocol>=3.19.0.58400.0',

     

       28
       28
       +
       +    'six',

     

       29
       29
       +
       +    'websocket-client',

     

       30
       30
       +
       +]

     

       31
       31
       +
       +

     

       32
       32
       +
       +if sys.version_info[0] == 2:

     

       33
       33
       +
       +    requires.append('futures')

     

       34
       34
       +
       +

     

       35
       35
       +
       +if (sys.version_info[0] == 2

     

       36
       36
       +
       +        or (sys.version_info[0] == 3 and sys.version_info[1] < 4)):

     

       37
       37
       +
       +    requires.append('enum34')

     

       38
       38
       +
       +

     

       39
       39
       +
        setup(

     

       40
       40
       +
            name='PySC2',

     

       41
       41
       +
            version='1.2',

     

       42
       42
       +
       @@ -56,21 +79,7 @@ setup(

     

       43
       43
       +
                'pysc2.run_configs',

     

       44
       44
       +
                'pysc2.tests',

     

       45
       45
       +
            ],

     

       46
       46
       +
       -    install_requires=[

     

       47
       47
       +
       -        'absl-py>=0.1.0',

     

       48
       48
       +
       -        'enum34',

     

       49
       49
       +
       -        'future',

     

       50
       50
       +
       -        'futures',

     

       51
       51
       +
       -        'mock',

     

       52
       52
       +
       -        'mpyq',

     

       53
       53
       +
       -        'numpy>=1.10',

     

       54
       54
       +
       -        'portpicker>=1.2.0',

     

       55
       55
       +
       -        'protobuf>=2.6',

     

       56
       56
       +
       -        'pygame',

     

       57
       57
       +
       -        's2clientprotocol>=3.19.0.58400.0',

     

       58
       58
       +
       -        'six',

     

       59
       59
       +
       -        'websocket-client',

     

       60
       60
       +
       -    ],

     

       61
       61
       +
       +    install_requires=requires,

     

       62
       62
       +
            entry_points={

     

       63
       63
       +
                'console_scripts': [

     

       64
       64
       +
                    'pysc2_agent = pysc2.bin.agent:entry_point',

+18

pkgs/development/python-modules/pysc2/parameterize-runconfig-sc2path.patch

···

       1
       1
       +
       diff --git a/pysc2/run_configs/platforms.py b/pysc2/run_configs/platforms.py

     

       2
       2
       +
       index 5cd84f9..1923cb7 100644

     

       3
       3
       +
       --- a/pysc2/run_configs/platforms.py

     

       4
       4
       +
       +++ b/pysc2/run_configs/platforms.py

     

       5
       5
       +
       @@ -119,12 +119,9 @@ class Linux(LocalBase):

     

       6
       6
       +
          """Config to run on Linux."""

     

       7
       7
       +
        

     

       8
       8
       +
          def __init__(self):

     

       9
       9
       +
       -    base_dir = os.environ.get("SC2PATH", "~/StarCraftII")

     

       10
       10
       +
       +    base_dir = os.environ.get("SC2PATH", "@sc2path@")

     

       11
       11
       +
            base_dir = os.path.expanduser(base_dir)

     

       12
       12
       +
            env = copy.deepcopy(os.environ)

     

       13
       13
       +
       -    env["LD_LIBRARY_PATH"] = ":".join(filter(None, [

     

       14
       14
       +
       -        os.environ.get("LD_LIBRARY_PATH"),

     

       15
       15
       +
       -        os.path.join(base_dir, "Libs/")]))

     

       16
       16
       +
            super(Linux, self).__init__(base_dir, "SC2_x64", env=env)

     

       17
       17
       +
        

     

       18
       18
       +
          @classmethod

+27

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , protobuf

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "s2clientprotocol";

     

       9
       9
       +
         version = "3.19.1.58600.0";

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "02jqwdfj5zpag4c5nf0707qmwk7sqm98yfgrd19rq6pi58zgl74f";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [ ./pure-version.patch ];

     

       18
       18
       +
       

     

       19
       19
       +
         buildInputs = [ protobuf ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           description = "StarCraft II - client protocol.";

     

       23
       23
       +
           homepage = "https://github.com/Blizzard/sc2client-proto";

     

       24
       24
       +
           license = lib.licenses.mit;

     

       25
       25
       +
           maintainers = with lib.maintainers; [ danharaj ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+13

pkgs/development/python-modules/s2clientprotocol/pure-version.patch

···

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

     

       2
       2
       +
       index 89131a8..19527df 100755

     

       3
       3
       +
       --- a/setup.py

     

       4
       4
       +
       +++ b/setup.py

     

       5
       5
       +
       @@ -13,8 +13,6 @@ from distutils.spawn import find_executable

     

       6
       6
       +
        from setuptools import setup

     

       7
       7
       +
        from setuptools.command.build_py import build_py

     

       8
       8
       +
        

     

       9
       9
       +
       -import gameversion_autogen as ver

     

       10
       10
       +
       -

     

       11
       11
       +
        SETUP_DIR = os.path.dirname(os.path.abspath(__file__))

     

       12
       12
       +
        PROTO_DIR = os.path.join(SETUP_DIR, 's2clientprotocol')

     

       13
       13
       +

+9

pkgs/top-level/python-packages.nix

···

       106
       106
        
         # Left for backwards compatibility

     

       107
       107
        
         "3to2" = self.py3to2;

     

       108
       108
        
       

     

       109
       109
       +
         absl-py = callPackage ../development/python-modules/absl-py { };

     

       110
       110
       +
       

     

       109
       111
        
         aenum = callPackage ../development/python-modules/aenum { };

     

       110
       112
        
       

     

       111
       113
        
         affinity = callPackage ../development/python-modules/affinity { };

     
···

       267
       269
        
         pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {

     

       268
       270
        
           pythonPackages = self;

     

       269
       271
        
         };

     

       272
       272
       +
       

     

       273
       273
       +
         pysc2 = callPackage ../development/python-modules/pysc2 { };

     

       270
       274
        
       

     

       271
       275
        
         pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; };

     

       272
       276
        
       

     
···

       3321
       3325
        
           };

     

       3322
       3326
        
         };

     

       3323
       3327
        
       

     

       3328
       3328
       +
         mpyq = callPackage ../development/python-modules/mpyq { };

     

       3329
       3329
       +
       

     

       3324
       3330
        
         mxnet = buildPythonPackage rec {

     

       3325
       3331
        
           inherit (pkgs.mxnet) name version src meta;

     

       3326
       3332
        
       

     
···

       3340
       3346
        
             ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet

     

       3341
       3347
        
           '';

     

       3342
       3348
        
         };

     

       3349
       3349
       +
       

     

       3350
       3350
       +
         portpicker = callPackage ../development/python-modules/portpicker { };

     

       3343
       3351
        
       

     

       3344
       3352
        
         pkginfo = buildPythonPackage rec {

     

       3345
       3353
        
           version = "1.3.2";

     
···

       7178
       7186
        
           meta.broken = true; # Tests fail, and no reverse-dependencies anyway

     

       7179
       7187
        
         };

     

       7180
       7188
        
       

     

       7189
       7189
       +
         s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { };

     

       7181
       7190
        
       

     

       7182
       7191
        
         statsd = buildPythonPackage rec {

     

       7183
       7192
        
           name = "statsd-${version}";