commit 02249fd1b26a103baba82b7a5e41bdbfdbb2f854 · pyrox.dev/nixpkgs

+23 -11

pkgs/development/python-modules/craft-store/default.nix

···

       6
       6
        
         setuptools,

     

       7
       7
        
         setuptools-scm,

     

       8
       8
        
         pytest-check,

     

       9
       9
       +
         pytest-httpx,

     

       9
       10
        
         pytest-mock,

     

       10
       10
       -
         pydantic,

     

       11
       11
        
         pyyaml,

     

       12
       12
        
         pytestCheckHook,

     

       13
       13
       -
         keyring_24,

     

       13
       13
       +
         annotated-types,

     

       14
       14
       +
         httpx,

     

       15
       15
       +
         jaraco-classes,

     

       16
       16
       +
         keyring,

     

       14
       17
        
         macaroonbakery,

     

       15
       18
        
         overrides,

     

       19
       19
       +
         pydantic,

     

       16
       20
        
         pyxdg,

     

       17
       21
        
         requests,

     

       18
       22
        
         requests-toolbelt,

     

       23
       23
       +
         typing-extensions,

     

       19
       24
        
       }:

     

       20
       25
        
       

     

       21
       26
        
       buildPythonPackage rec {

     

       22
       27
        
         pname = "craft-store";

     

       23
       23
       -
         version = "3.0.2";

     

       28
       28
       +
         version = "3.1.0";

     

       24
       29
        
       

     

       25
       30
        
         pyproject = true;

     

       26
       31
        
       

     

       27
       32
        
         src = fetchFromGitHub {

     

       28
       33
        
           owner = "canonical";

     

       29
       34
        
           repo = "craft-store";

     

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

     

       31
       31
       -
           hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";

     

       35
       35
       +
           tag = version;

     

       36
       36
       +
           hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";

     

       32
       37
        
         };

     

       33
       38
        
       

     

       34
       39
        
         postPatch = ''

     

       35
       40
        
           substituteInPlace pyproject.toml \

     

       36
       36
       -
             --replace-fail "setuptools==" "setuptools>="

     

       41
       41
       +
             --replace-fail "setuptools==75.6.0" "setuptools"

     

       37
       42
        
         '';

     

       38
       43
        
       

     

       39
       39
       -
         build-system = [ setuptools-scm ];

     

       44
       44
       +
         build-system = [

     

       45
       45
       +
           setuptools

     

       46
       46
       +
           setuptools-scm

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         pythonRelaxDeps = [ "httpx" ];

     

       40
       50
        
       

     

       41
       51
        
         dependencies = [

     

       42
       42
       -
           keyring_24

     

       52
       52
       +
           annotated-types

     

       53
       53
       +
           httpx

     

       54
       54
       +
           jaraco-classes

     

       55
       55
       +
           keyring

     

       43
       56
        
           macaroonbakery

     

       44
       57
        
           overrides

     

       45
       58
        
           pydantic

     

       46
       59
        
           pyxdg

     

       47
       60
        
           requests

     

       48
       61
        
           requests-toolbelt

     

       62
       62
       +
           typing-extensions

     

       49
       63
        
         ];

     

       50
       64
        
       

     

       51
       51
       -
         pythonRelaxDeps = [ "macaroonbakery" ];

     

       52
       52
       -
       

     

       53
       65
        
         pythonImportsCheck = [ "craft_store" ];

     

       54
       66
        
       

     

       55
       67
        
         nativeCheckInputs = [

     

       56
       56
       -
           pydantic

     

       57
       68
        
           pytest-check

     

       69
       69
       +
           pytest-httpx

     

       58
       70
        
           pytest-mock

     

       59
       71
        
           pytestCheckHook

     

       60
       72
        
           pyyaml

-81

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         buildPythonPackage,

     

       5
       5
       -
         fetchPypi,

     

       6
       6
       -
         pythonOlder,

     

       7
       7
       -
         installShellFiles,

     

       8
       8
       -
         setuptools,

     

       9
       9
       -
         setuptools-scm,

     

       10
       10
       -
         shtab,

     

       11
       11
       -
         importlib-metadata,

     

       12
       12
       -
         jaraco-classes,

     

       13
       13
       -
         jaraco-context,

     

       14
       14
       -
         jaraco-functools,

     

       15
       15
       -
         jeepney,

     

       16
       16
       -
         secretstorage,

     

       17
       17
       -
         pytestCheckHook,

     

       18
       18
       -
       }:

     

       19
       19
       -
       

     

       20
       20
       -
       buildPythonPackage rec {

     

       21
       21
       -
         pname = "keyring_24";

     

       22
       22
       -
         # nixpkgs-update: no auto update

     

       23
       23
       -
         version = "24.3.1";

     

       24
       24
       -
         pyproject = true;

     

       25
       25
       -
         disabled = pythonOlder "3.8";

     

       26
       26
       -
       

     

       27
       27
       -
         src = fetchPypi {

     

       28
       28
       -
           inherit version;

     

       29
       29
       -
           pname = "keyring";

     

       30
       30
       -
           hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs=";

     

       31
       31
       -
         };

     

       32
       32
       -
       

     

       33
       33
       -
         nativeBuildInputs = [

     

       34
       34
       -
           installShellFiles

     

       35
       35
       -
           shtab

     

       36
       36
       -
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         build-system = [

     

       39
       39
       -
           setuptools

     

       40
       40
       -
           setuptools-scm

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         dependencies =

     

       44
       44
       -
           [

     

       45
       45
       -
             jaraco-classes

     

       46
       46
       -
             jaraco-context

     

       47
       47
       -
             jaraco-functools

     

       48
       48
       -
           ]

     

       49
       49
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       50
       50
       -
             jeepney

     

       51
       51
       -
             secretstorage

     

       52
       52
       -
           ]

     

       53
       53
       -
           ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];

     

       54
       54
       -
       

     

       55
       55
       -
         postInstall = ''

     

       56
       56
       -
           installShellCompletion --cmd keyring \

     

       57
       57
       -
             --bash <($out/bin/keyring --print-completion bash) \

     

       58
       58
       -
             --zsh <($out/bin/keyring --print-completion zsh)

     

       59
       59
       -
         '';

     

       60
       60
       -
       

     

       61
       61
       -
         pythonImportsCheck = [

     

       62
       62
       -
           "keyring"

     

       63
       63
       -
           "keyring.backend"

     

       64
       64
       -
         ];

     

       65
       65
       -
       

     

       66
       66
       -
         nativeCheckInputs = [ pytestCheckHook ];

     

       67
       67
       -
       

     

       68
       68
       -
         disabledTestPaths =

     

       69
       69
       -
           [ "tests/backends/test_macOS.py" ]

     

       70
       70
       -
           # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.

     

       71
       71
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";

     

       72
       72
       -
       

     

       73
       73
       -
         meta = with lib; {

     

       74
       74
       -
           description = "Store and access your passwords safely";

     

       75
       75
       -
           homepage = "https://github.com/jaraco/keyring";

     

       76
       76
       -
           changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst";

     

       77
       77
       -
           license = licenses.mit;

     

       78
       78
       -
           mainProgram = "keyring";

     

       79
       79
       -
           maintainers = with maintainers; [ jnsgruk ];

     

       80
       80
       -
         };

     

       81
       81
       -
       }

+9 -3

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

···

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "go-macaroon-bakery";

     

       26
       26
        
           repo = "py-macaroon-bakery";

     

       27
       27
       -
           rev = "refs/tags/${version}";

     

       27
       27
       +
           tag = version;

     

       28
       28
        
           hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ setuptools ];

     

       31
       31
       +
         # fix version string

     

       32
       32
       +
         postPatch = ''

     

       33
       33
       +
           substituteInPlace setup.py \

     

       34
       34
       +
             --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"

     

       35
       35
       +
         '';

     

       32
       36
        
       

     

       33
       33
       -
         propagatedBuildInputs = [

     

       37
       37
       +
         build-system = [ setuptools ];

     

       38
       38
       +
       

     

       39
       39
       +
         dependencies = [

     

       34
       40
        
           protobuf

     

       35
       41
        
           pymacaroons

     

       36
       42
        
           pynacl

pkgs/top-level/python-aliases.nix

···

       319
       319
        
         Kajiki = kajiki; # added 2023-02-19

     

       320
       320
        
         keepkey_agent = keepkey-agent; # added 2024-01-06

     

       321
       321
        
         Keras = keras; # added 2021-11-25

     

       322
       322
       +
         keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01

     

       322
       323
        
         ldap = python-ldap; # added 2022-09-16

     

       323
       324
        
         lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04

     

       324
       325
        
         langchainplus-sdk = langsmith; # added 2023-08-01

-2

pkgs/top-level/python-packages.nix

···

       6948
       6948
        
       

     

       6949
       6949
        
         keyring = callPackage ../development/python-modules/keyring { };

     

       6950
       6950
        
       

     

       6951
       6951
       -
         keyring_24 = callPackage ../development/python-modules/keyring_24 { };

     

       6952
       6952
       -
       

     

       6953
       6951
        
         keyring-pass = callPackage ../development/python-modules/keyring-pass { };

     

       6954
       6952
        
       

     

       6955
       6953
        
         keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };