treewide: openssl_1_1 pinning is unnecessary
This commit is contained in:
parent
c7e75df21f
commit
2cc05be907
|
@ -1,4 +1,4 @@
|
|||
{ python37, openssl_1_1
|
||||
{ python37, openssl
|
||||
, callPackage }:
|
||||
|
||||
# To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
|
||||
|
@ -23,16 +23,6 @@ let
|
|||
todosrht = self.callPackage ./todo.nix { };
|
||||
|
||||
scmsrht = self.callPackage ./scm.nix { };
|
||||
|
||||
# OVERRIDES
|
||||
|
||||
cryptography = super.cryptography.override {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
pyopenssl = super.pyopenssl.override {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
};
|
||||
};
|
||||
in with python.pkgs; {
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
|
||||
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
|
||||
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl
|
||||
, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
|
||||
, libapparmor, gst_all_1
|
||||
, spiceSupport ? true
|
||||
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
|
||||
, xenSupport ? false, xen ? null
|
||||
}:
|
||||
|
||||
assert spiceSupport ->
|
||||
|
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
|
||||
libvirt yajl gsettings-desktop-schemas libvirt-glib
|
||||
libcap_ng numactl libapparmor
|
||||
] ++ optionals stdenv.isx86_64 [
|
||||
] ++ optionals xenSupport [
|
||||
xen
|
||||
] ++ optionals spiceSupport [
|
||||
spice-gtk spice-protocol libcap gdbm
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
|
||||
, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl
|
||||
, xen, libapparmor, vala
|
||||
, libapparmor, vala
|
||||
, xenSupport ? false, xen ? null
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -19,7 +20,7 @@ in stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
|
||||
python pygobject2 gobject-introspection libcap_ng numactl libapparmor
|
||||
] ++ stdenv.lib.optionals stdenv.isx86_64 [
|
||||
] ++ stdenv.lib.optionals xenSupport [
|
||||
xen
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, autoreconfHook
|
||||
, libgsf
|
||||
, pkgconfig
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, curl
|
||||
}:
|
||||
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl_1_1 curl ];
|
||||
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/mtrojnar/osslsigncode";
|
||||
|
|
|
@ -4130,11 +4130,7 @@ in {
|
|||
|
||||
pgspecial = callPackage ../development/python-modules/pgspecial { };
|
||||
|
||||
pgpy = callPackage ../development/python-modules/pgpy {
|
||||
cryptography = self.cryptography.override {
|
||||
openssl = pkgs.openssl_1_1;
|
||||
};
|
||||
};
|
||||
pgpy = callPackage ../development/python-modules/pgpy { };
|
||||
|
||||
pickleshare = callPackage ../development/python-modules/pickleshare { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue