mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-24 15:16:41 +00:00
Use the nixpkgs-provided pyopenssl
This commit is contained in:
parent
76726f24f2
commit
916a68439a
@ -1,10 +0,0 @@
|
|||||||
{ pyopenssl, fetchPypi, isPyPy }:
|
|
||||||
pyopenssl.overrideAttrs (old: rec {
|
|
||||||
pname = "pyOpenSSL";
|
|
||||||
version = "24.1.0";
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "yr7Uv6pd+fGhbA72Sgy2Uxi1zQd6ftp9aXATHKL0Gm8=";
|
|
||||||
};
|
|
||||||
})
|
|
@ -58,13 +58,6 @@ in {
|
|||||||
patches = (old.patches or []) ++ [ ./twisted.patch ];
|
patches = (old.patches or []) ++ [ ./twisted.patch ];
|
||||||
});
|
});
|
||||||
|
|
||||||
# Update the version of pyopenssl - and since we're doing that anyway, we
|
|
||||||
# don't need the docs. Unfortunately this triggers a lot of rebuilding of
|
|
||||||
# dependent packages.
|
|
||||||
pyopenssl = dontBuildDocs (self.callPackage ./pyopenssl.nix {
|
|
||||||
inherit (super) pyopenssl;
|
|
||||||
});
|
|
||||||
|
|
||||||
# The cryptography that we get from nixpkgs to satisfy the pyopenssl upgrade
|
# The cryptography that we get from nixpkgs to satisfy the pyopenssl upgrade
|
||||||
# that we did breaks service-identity ... so get a newer version that works.
|
# that we did breaks service-identity ... so get a newer version that works.
|
||||||
service-identity = self.callPackage ./service-identity.nix { };
|
service-identity = self.callPackage ./service-identity.nix { };
|
||||||
|
@ -1,61 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, attrs
|
|
||||||
, buildPythonPackage
|
|
||||||
, cryptography
|
|
||||||
, fetchFromGitHub
|
|
||||||
, hatch-fancy-pypi-readme
|
|
||||||
, hatch-vcs
|
|
||||||
, hatchling
|
|
||||||
, idna
|
|
||||||
, pyasn1
|
|
||||||
, pyasn1-modules
|
|
||||||
, pytestCheckHook
|
|
||||||
, pythonOlder
|
|
||||||
, setuptools
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "service-identity";
|
|
||||||
version = "23.1.0";
|
|
||||||
format = "pyproject";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "pyca";
|
|
||||||
repo = pname;
|
|
||||||
rev = "refs/tags/${version}";
|
|
||||||
hash = "sha256-PGDtsDgRwh7GuuM4OuExiy8L4i3Foo+OD0wMrndPkvo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
hatch-fancy-pypi-readme
|
|
||||||
hatch-vcs
|
|
||||||
hatchling
|
|
||||||
setuptools
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
attrs
|
|
||||||
cryptography
|
|
||||||
idna
|
|
||||||
pyasn1
|
|
||||||
pyasn1-modules
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeCheckInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
|
||||||
"service_identity"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Service identity verification for pyOpenSSL";
|
|
||||||
homepage = "https://service-identity.readthedocs.io";
|
|
||||||
changelog = "https://github.com/pyca/service-identity/releases/tag/${version}";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ fab ];
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user