commit 6d9f80d743f39d341cb1a49f12cbae4b3b5af0cd · pyrox.dev/nixpkgs

+16 -12

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         bibtexparser,

     

       4
       3
        
         buildPythonPackage,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
       

     

       7
       7
       +
         # build-system

     

       8
       8
       +
         setuptools,

     

       9
       9
       +
       

     

       10
       10
       +
         # dependencies

     

       11
       11
       +
         bibtexparser,

     

       5
       12
        
         cdcs,

     

       6
       13
        
         datamodeldict,

     

       7
       7
       -
         fetchPypi,

     

       8
       14
        
         habanero,

     

       9
       15
        
         ipywidgets,

     

       10
       16
        
         lxml,

     

       11
       17
        
         matplotlib,

     

       12
       18
        
         numpy,

     

       13
       19
        
         pandas,

     

       14
       14
       -
         pythonOlder,

     

       15
       20
        
         requests,

     

       16
       21
        
         scipy,

     

       17
       17
       -
         setuptools,

     

       18
       22
        
         unidecode,

     

       19
       23
        
         xmltodict,

     

       20
       24
        
         yabadaba,

     
···

       25
       29
        
         version = "0.4.0";

     

       26
       30
        
         pyproject = true;

     

       27
       31
        
       

     

       28
       28
       -
         disabled = pythonOlder "3.7";

     

       29
       29
       -
       

     

       30
       30
       -
         src = fetchPypi {

     

       31
       31
       -
           inherit pname version;

     

       32
       32
       -
           hash = "sha256-7ujcfFa/cweUtCY2MrEh3bTkwAVzvbF+5AJ4fs5o6bE=";

     

       32
       32
       +
         src = fetchFromGitHub {

     

       33
       33
       +
           owner = "usnistgov";

     

       34
       34
       +
           repo = "potentials";

     

       35
       35
       +
           tag = "v${version}";

     

       36
       36
       +
           hash = "sha256-VDA3dQ34kvrs3XMfC0j3T63KrXlmOa/hPvOni/UkgP4=";

     

       33
       37
        
         };

     

       34
       38
        
       

     

       35
       39
        
         build-system = [ setuptools ];

     
···

       56
       60
        
       

     

       57
       61
        
         pythonImportsCheck = [ "potentials" ];

     

       58
       62
        
       

     

       59
       59
       -
         meta = with lib; {

     

       63
       63
       +
         meta = {

     

       60
       64
        
           description = "Python API database tools for accessing the NIST Interatomic Potentials Repository";

     

       61
       65
        
           homepage = "https://github.com/usnistgov/potentials";

     

       62
       66
        
           changelog = "https://github.com/usnistgov/potentials/releases/tag/v${version}";

     

       63
       63
       -
           license = licenses.mit;

     

       64
       64
       -
           maintainers = with maintainers; [ fab ];

     

       67
       67
       +
           license = lib.licenses.mit;

     

       68
       68
       +
           maintainers = with lib.maintainers; [ fab ];

     

       65
       69
        
         };

     

       66
       70
        
       }

+21 -16

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       7
       7
       +
         setuptools,

     

       8
       8
       +
       

     

       9
       9
       +
         # dependencies

     

       4
       10
        
         cdcs,

     

       5
       11
        
         datamodeldict,

     

       6
       6
       -
         fetchFromGitHub,

     

       7
       12
        
         ipython,

     

       8
       13
        
         lxml,

     

       9
       14
        
         numpy,

     

       10
       15
        
         pandas,

     

       16
       16
       +
         pillow,

     

       11
       17
        
         pymongo,

     

       18
       18
       +
         tqdm,

     

       19
       19
       +
       

     

       20
       20
       +
         # tests

     

       12
       21
        
         pytestCheckHook,

     

       13
       13
       -
         pythonOlder,

     

       14
       14
       -
         setuptools,

     

       15
       15
       -
         tqdm,

     

       22
       22
       +
         writableTmpDirAsHomeHook,

     

       16
       23
        
       }:

     

       17
       24
        
       

     

       18
       25
        
       buildPythonPackage rec {

     

       19
       26
        
         pname = "yabadaba";

     

       20
       20
       -
         version = "0.2.2";

     

       27
       27
       +
         version = "0.3.1";

     

       21
       28
        
         pyproject = true;

     

       22
       22
       -
       

     

       23
       23
       -
         disabled = pythonOlder "3.7";

     

       24
       29
        
       

     

       25
       30
        
         src = fetchFromGitHub {

     

       26
       31
        
           owner = "usnistgov";

     

       27
       32
        
           repo = "yabadaba";

     

       28
       33
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI=";

     

       34
       34
       +
           hash = "sha256-DpkJvi4w0aoD7RC2IFORy8uZ12TuLdcJxfLaSGyATac=";

     

       30
       35
        
         };

     

       31
       36
        
       

     

       32
       37
        
         build-system = [ setuptools ];

     
···

       38
       43
        
           lxml

     

       39
       44
        
           numpy

     

       40
       45
        
           pandas

     

       46
       46
       +
           pillow

     

       41
       47
        
           pymongo

     

       42
       48
        
           tqdm

     

       43
       49
        
         ];

     

       44
       50
        
       

     

       45
       45
       -
         nativeCheckInputs = [ pytestCheckHook ];

     

       51
       51
       +
         nativeCheckInputs = [

     

       52
       52
       +
           pytestCheckHook

     

       53
       53
       +
           writableTmpDirAsHomeHook

     

       54
       54
       +
         ];

     

       46
       55
        
       

     

       47
       56
        
         pythonImportsCheck = [ "yabadaba" ];

     

       48
       57
        
       

     

       49
       49
       -
         preCheck = ''

     

       50
       50
       -
           export HOME=$(mktemp -d);

     

       51
       51
       -
         '';

     

       52
       52
       -
       

     

       53
       53
       -
         meta = with lib; {

     

       58
       58
       +
         meta = {

     

       54
       59
        
           description = "Abstraction layer allowing for common interactions with databases and records";

     

       55
       60
        
           homepage = "https://github.com/usnistgov/yabadaba";

     

       56
       61
        
           changelog = "https://github.com/usnistgov/yabadaba/releases/tag/v${version}";

     

       57
       57
       -
           license = licenses.mit;

     

       58
       58
       -
           maintainers = with maintainers; [ fab ];

     

       62
       62
       +
           license = lib.licenses.mit;

     

       63
       63
       +
           maintainers = with lib.maintainers; [ fab ];

     

       59
       64
        
         };

     

       60
       65
        
       }