diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix deleted file mode 100644 index 471529675dbf..000000000000 --- a/pkgs/applications/misc/nut/2.6.3.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 51ae8633a7c0..b89a35d2f814 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }: +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: -stdenv.mkDerivation { - name = "nut-2.6.1"; +stdenv.mkDerivation rec { + name = "nut-2.6.5"; src = fetchurl { - url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz; - sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00"; + url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz"; + sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1"; }; - buildInputs = [ pkgconfig neon libusb openssl udev ]; + buildInputs = [ neon libusb openssl udev avahi freeipmi ]; - configureFlags = [ - "--with-all" - "--without-snmp" # Until we have it ... - "--without-powerman" # Until we have it ... - "--without-cgi" - ]; + buildNativeInputs = [ pkgconfig ]; + + configureFlags = + [ "--with-all" + "--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 = { description = "Network UPS Tools"; @@ -27,5 +34,6 @@ stdenv.mkDerivation { homepage = http://www.networkupstools.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; + priority = 10; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1941780ebc7..c8fdc0653285 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8886,8 +8886,6 @@ let nut = callPackage ../applications/misc/nut { }; - nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { }; - disnix = callPackage ../tools/package-management/disnix { }; disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {