diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/python-modules/pyasn1-modules | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pyasn1-modules')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix index 4bb515e17aa6..7a0735269897 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,35 +1,41 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyasn1 -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.8"; + version = "0.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyasn1"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-AAS1VuppCIxgswpLSHFAc6q9cyJBLpdDuU9D1KU13vg="; }; - propagatedBuildInputs = [ pyasn1 ]; + propagatedBuildInputs = [ + pyasn1 + ]; - checkInputs = [ - pytest + nativeCheckInputs = [ + pytestCheckHook ]; - # running tests through setup.py fails only for python2 for some reason: - # AttributeError: 'module' object has no attribute 'suitetests' - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "pyasn1_modules" + ]; meta = with lib; { description = "A collection of ASN.1-based protocols modules"; - homepage = "https://pypi.python.org/pypi/pyasn1-modules"; + homepage = "https://github.com/pyasn1/pyasn1-modules"; + changelog = "https://github.com/pyasn1/pyasn1-modules/releases/tag/v${version}"; license = licenses.bsd3; - platforms = platforms.unix; # same as pyasn1 + maintainers = with maintainers; [ ]; }; } |