Merge pull request #202011 from dotlambda/johnnycanencrypt-0.11.0
python310Packages.johnnycanencrypt: 0.6.0 -> 0.11.0
This commit is contained in:
commit
af50806f7c
|
@ -1,17 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, pyside2
|
||||
, johnnycanencrypt
|
||||
, pythonOlder
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tumpa";
|
||||
version = "0.1.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kushaldas";
|
||||
|
@ -20,7 +15,7 @@ buildPythonPackage rec {
|
|||
sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
johnnycanencrypt
|
||||
pyside2
|
||||
|
@ -42,5 +37,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/kushaldas/tumpa";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
File diff suppressed because it is too large
Load diff
|
@ -7,8 +7,7 @@
|
|||
, pkg-config
|
||||
, pcsclite
|
||||
, nettle
|
||||
, requests
|
||||
, vcrpy
|
||||
, httpx
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
@ -18,31 +17,31 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "johnnycanencrypt";
|
||||
version = "0.6.0";
|
||||
version = "0.11.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kushaldas";
|
||||
repo = "johnnycanencrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g";
|
||||
hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit patches src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY=";
|
||||
hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
# https://github.com/kushaldas/johnnycanencrypt/issues/125
|
||||
patches = [ ./Cargo.lock.patch ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
vcrpy
|
||||
httpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -54,8 +53,9 @@ buildPythonPackage rec {
|
|||
]);
|
||||
|
||||
buildInputs = [
|
||||
pcsclite
|
||||
nettle
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pcsclite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
PCSC
|
||||
libiconv
|
||||
|
@ -70,14 +70,6 @@ buildPythonPackage rec {
|
|||
numpy
|
||||
];
|
||||
|
||||
# Remove with the next release after 0.5.0. This change is required
|
||||
# for compatibility with maturin 0.9.0.
|
||||
postPatch = ''
|
||||
sed '/project-url = /d' -i Cargo.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'manylinux = "off"' 'skip-auditwheel = true'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export TESTDIR=$(mktemp -d)
|
||||
cp -r tests/ $TESTDIR
|
||||
|
@ -91,7 +83,6 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "johnnycanencrypt" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
homepage = "https://github.com/kushaldas/johnnycanencrypt";
|
||||
description = "Python module for OpenPGP written in Rust";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
@ -32536,6 +32536,10 @@ with pkgs;
|
|||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
tumpa = callPackage ../applications/misc/tumpa {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
tuna = python3Packages.callPackage ../os-specific/linux/tuna { };
|
||||
|
||||
tunefish = callPackage ../applications/audio/tunefish {
|
||||
|
|
|
@ -207,6 +207,7 @@ mapAliases ({
|
|||
tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
|
||||
tensorflow-tensorboard = tensorboard; # added 2022-03-06
|
||||
tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
|
||||
tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
|
||||
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
|
||||
types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
|
||||
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
|
||||
|
|
|
@ -11330,10 +11330,6 @@ self: super: with self; {
|
|||
|
||||
tubeup = callPackage ../development/python-modules/tubeup { };
|
||||
|
||||
tumpa = callPackage ../development/python-modules/tumpa {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
turnt = callPackage ../development/python-modules/turnt { };
|
||||
|
||||
tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { };
|
||||
|
|
Loading…
Reference in a new issue