JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: openssl_1_1 pinning is unnecessary

Browse Source
This commit is contained in:
Robin Gloster 2019-08-23 02:02:50 +02:00
parent c7e75df21f
commit 2cc05be907
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
5 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/sourcehut/default.nix
View File

@ -1,4 +1,4 @@
{ python37, openssl_1_1 { python37, openssl
, callPackage }: , callPackage }:
# To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # 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 { }; todosrht = self.callPackage ./todo.nix { };
scmsrht = self.callPackage ./scm.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; { in with python.pkgs; {

5
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp { 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 , gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
, libapparmor, gst_all_1 , libapparmor, gst_all_1
, spiceSupport ? true , spiceSupport ? true
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
, xenSupport ? false, xen ? null
}: }:
assert spiceSupport -> assert spiceSupport ->
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
libvirt yajl gsettings-desktop-schemas libvirt-glib libvirt yajl gsettings-desktop-schemas libvirt-glib
libcap_ng numactl libapparmor libcap_ng numactl libapparmor
] ++ optionals stdenv.isx86_64 [ ] ++ optionals xenSupport [
xen xen
] ++ optionals spiceSupport [ ] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm spice-gtk spice-protocol libcap gdbm

5
pkgs/development/libraries/libvirt-glib/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl , nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl
, xen, libapparmor, vala , libapparmor, vala
, xenSupport ? false, xen ? null
}: }:
let let
@ -19,7 +20,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
python pygobject2 gobject-introspection libcap_ng numactl libapparmor python pygobject2 gobject-introspection libcap_ng numactl libapparmor
] ++ stdenv.lib.optionals stdenv.isx86_64 [ ] ++ stdenv.lib.optionals xenSupport [
xen xen
]; ];

4
pkgs/development/tools/osslsigncode/default.nix
View File

@ -3,7 +3,7 @@
, autoreconfHook , autoreconfHook
, libgsf , libgsf
, pkgconfig , pkgconfig
, openssl_1_1 , openssl
, curl , curl
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8"; sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8";
}; };
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl_1_1 curl ]; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/mtrojnar/osslsigncode"; homepage = "https://github.com/mtrojnar/osslsigncode";

6
pkgs/top-level/python-packages.nix
View File

@ -4130,11 +4130,7 @@ in {
pgspecial = callPackage ../development/python-modules/pgspecial { }; pgspecial = callPackage ../development/python-modules/pgspecial { };
pgpy = callPackage ../development/python-modules/pgpy { pgpy = callPackage ../development/python-modules/pgpy { };
cryptography = self.cryptography.override {
openssl = pkgs.openssl_1_1;
};
};
pickleshare = callPackage ../development/python-modules/pickleshare { }; pickleshare = callPackage ../development/python-modules/pickleshare { };