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

nut: build with openssl 1.1.x

Browse Source 
instead of nss (it is upstream preference)
+ update homepage and src URLs to fetch over TLS

Close #67906
This commit is contained in:
Renaud 2019-11-24 15:54:00 +01:00 committed by GitHub
parent c2d9d6146a
commit fd75f27ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/misc/nut/default.nix
View File

@ -1,17 +1,27 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
, libtool, makeWrapper, nss }: , libtool, makeWrapper, autoreconfHook, fetchpatch
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nut-2.7.4"; pname = "nut";
version = "2.7.4";
src = fetchurl { src = fetchurl {
url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz"; url = "https://networkupstools.org/source/2.7/${pname}-${version}.tar.gz";
sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
}; };
buildInputs = [ neon libusb openssl udev avahi freeipmi libtool nss ]; patches = [
(fetchpatch {
# Fix build with openssl >= 1.1.0
url = "https://github.com/networkupstools/nut/commit/612c05efb3c3b243da603a3a050993281888b6e3.patch";
sha256 = "0jdbii1z5sqyv24286j5px65j7b3gp8zk3ahbph83pig6g46m3hs";
})
];
nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ neon libusb openssl udev avahi freeipmi ];
nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ];
configureFlags = configureFlags =
[ "--with-all" [ "--with-all"
@ -26,7 +36,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = '' postInstall = ''
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
"$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
@ -39,7 +48,7 @@ stdenv.mkDerivation rec {
interface for monitoring and administering UPS, PDU and SCD hardware. interface for monitoring and administering UPS, PDU and SCD hardware.
It uses a layered approach to connect all of the parts. It uses a layered approach to connect all of the parts.
''; '';
homepage = http://www.networkupstools.org/; homepage = https://networkupstools.org/;
repositories.git = https://github.com/networkupstools/nut.git; repositories.git = https://github.com/networkupstools/nut.git;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.pierron ]; maintainers = [ maintainers.pierron ];