lol

Merge pull request #211660 from dotlambda/johnnycanencrypt-0.12.0

python310Packages.johnnycanencrypt: 0.11.0 -> 0.12.0

authored by

0x4A6F and committed by
GitHub
be83a2ed c48641fb

+15 -28
+15 -28
pkgs/development/python-modules/johnnycanencrypt/default.nix
··· 1 1 { lib 2 2 , stdenv 3 - , fetchFromGitHub 3 + , fetchPypi 4 4 , buildPythonPackage 5 5 , rustPlatform 6 6 , llvmPackages ··· 8 8 , pcsclite 9 9 , nettle 10 10 , httpx 11 - , numpy 12 11 , pytestCheckHook 13 12 , pythonOlder 13 + , vcrpy 14 14 , PCSC 15 15 , libiconv 16 16 }: 17 17 18 18 buildPythonPackage rec { 19 19 pname = "johnnycanencrypt"; 20 - version = "0.11.0"; 21 - disabled = pythonOlder "3.7"; 20 + version = "0.12.0"; 21 + disabled = pythonOlder "3.8"; 22 22 23 - src = fetchFromGitHub { 24 - owner = "kushaldas"; 25 - repo = "johnnycanencrypt"; 26 - rev = "v${version}"; 27 - hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo="; 23 + src = fetchPypi { 24 + inherit pname version; 25 + hash = "sha256-aGhM/uyYE7l0h6L00qp+HRUVaj7s/tnHWIHJpLAkmR4="; 28 26 }; 29 27 30 28 cargoDeps = rustPlatform.fetchCargoTarball { 31 - inherit patches src; 29 + inherit src; 32 30 name = "${pname}-${version}"; 33 - hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs="; 31 + hash = "sha256-fcwDxkUFtA6LS77xdLktNnZJXmyl/ZzArvIW69SPpmI="; 34 32 }; 35 33 36 34 format = "pyproject"; 37 35 38 - # https://github.com/kushaldas/johnnycanencrypt/issues/125 39 - patches = [ ./Cargo.lock.patch ]; 40 - 41 36 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; 42 37 43 38 propagatedBuildInputs = [ ··· 61 56 libiconv 62 57 ]; 63 58 64 - # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) 65 - doCheck = false; 66 - doInstallCheck = true; 67 - 68 - installCheckInputs = [ 59 + checkInputs = [ 69 60 pytestCheckHook 70 - numpy 61 + vcrpy 71 62 ]; 72 63 73 64 preCheck = '' 74 - export TESTDIR=$(mktemp -d) 75 - cp -r tests/ $TESTDIR 76 - pushd $TESTDIR 77 - ''; 78 - 79 - postCheck = '' 80 - popd 65 + # import from $out 66 + rm -r johnnycanencrypt 81 67 ''; 82 68 83 69 pythonImportsCheck = [ "johnnycanencrypt" ]; 84 70 85 71 meta = with lib; { 86 72 homepage = "https://github.com/kushaldas/johnnycanencrypt"; 73 + changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md"; 87 74 description = "Python module for OpenPGP written in Rust"; 88 - license = licenses.gpl3Plus; 75 + license = licenses.lgpl3Plus; 89 76 maintainers = with maintainers; [ _0x4A6F ]; 90 77 }; 91 78 }