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

nut: Update to 2.6.5 and fix building against systemd

Browse Source 
http://hydra.nixos.org/build/3473781
This commit is contained in:
Eelco Dolstra 2012-12-12 16:17:47 +01:00
parent 6a176c79cf
commit fd6941ad48
3 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/misc/nut/2.6.3.nix
View File

@ -1,34 +0,0 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation {
name = "nut-2.6.3";
src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz;
sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l";
};
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
];
meta = {
description = "Network UPS Tools";
longDescription = ''
Network UPS Tools is a collection of programs which provide a common
interface for monitoring and administering UPS, PDU and SCD hardware.
It uses a layered approach to connect all of the parts.
'';
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
};
}

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

@ -1,21 +1,28 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }: { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "nut-2.6.1"; name = "nut-2.6.5";
src = fetchurl { src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz; url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00"; sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
}; };
buildInputs = [ pkgconfig neon libusb openssl udev ]; buildInputs = [ neon libusb openssl udev avahi freeipmi ];
configureFlags = [ buildNativeInputs = [ pkgconfig ];
"--with-all"
"--without-snmp" # Until we have it ... configureFlags =
"--without-powerman" # Until we have it ... [ "--with-all"
"--without-cgi" "--with-ssl"
]; "--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
];
enableParallelBuilding = true;
meta = { meta = {
description = "Network UPS Tools"; description = "Network UPS Tools";
@ -27,5 +34,6 @@ stdenv.mkDerivation {
homepage = http://www.networkupstools.org/; homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ]; maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -8886,8 +8886,6 @@ let
nut = callPackage ../applications/misc/nut { }; nut = callPackage ../applications/misc/nut { };
nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { };
disnix = callPackage ../tools/package-management/disnix { }; disnix = callPackage ../tools/package-management/disnix { };
disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {