b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #211660 from dotlambda/johnnycanencrypt-0.12.0

Browse source 
python310Packages.johnnycanencrypt: 0.11.0 -> 0.12.0
This commit is contained in:
0x4A6F 2023-01-20 00:59:42 +01:00 committed by GitHub
parent c48641fbc7 36c6a9899b
commit be83a2edc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/development/python-modules/johnnycanencrypt/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchPypi
, buildPythonPackage , buildPythonPackage
, rustPlatform , rustPlatform
, llvmPackages , llvmPackages
@ -8,36 +8,31 @@
, pcsclite , pcsclite
, nettle , nettle
, httpx , httpx
, numpy
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, vcrpy
, PCSC , PCSC
, libiconv , libiconv
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "johnnycanencrypt"; pname = "johnnycanencrypt";
version = "0.11.0"; version = "0.12.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchPypi {
owner = "kushaldas"; inherit pname version;
repo = "johnnycanencrypt"; hash = "sha256-aGhM/uyYE7l0h6L00qp+HRUVaj7s/tnHWIHJpLAkmR4=";
rev = "v${version}";
hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit patches src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs="; hash = "sha256-fcwDxkUFtA6LS77xdLktNnZJXmyl/ZzArvIW69SPpmI=";
}; };
format = "pyproject"; format = "pyproject";
# https://github.com/kushaldas/johnnycanencrypt/issues/125
patches = [ ./Cargo.lock.patch ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -61,31 +56,23 @@ buildPythonPackage rec {
libiconv libiconv
]; ];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) checkInputs = [
doCheck = false;
doInstallCheck = true;
installCheckInputs = [
pytestCheckHook pytestCheckHook
numpy vcrpy
]; ];
preCheck = '' preCheck = ''
export TESTDIR=$(mktemp -d) # import from $out
cp -r tests/ $TESTDIR rm -r johnnycanencrypt
pushd $TESTDIR
'';
postCheck = ''
popd
''; '';
pythonImportsCheck = [ "johnnycanencrypt" ]; pythonImportsCheck = [ "johnnycanencrypt" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kushaldas/johnnycanencrypt"; homepage = "https://github.com/kushaldas/johnnycanencrypt";
changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md";
description = "Python module for OpenPGP written in Rust"; description = "Python module for OpenPGP written in Rust";
license = licenses.gpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ _0x4A6F ]; maintainers = with maintainers; [ _0x4A6F ];
}; };
} }