Author: NicolasPierron
Date: Fri Jun 17 18:02:14 2011
New Revision: 27490
URL: https://svn.nixos.org/websvn/nix/?rev=27490&sc=1
Log:
freepops & nut: Use nixpkgs instead of inlined derivation.
Modified:
configurations/trunk/misc/nicolas.b.pierron/common/freepopsd.nix
configurations/trunk/misc/nicolas.b.pierron/common/ups.nix
Modified: configurations/trunk/misc/nicolas.b.pierron/common/freepopsd.nix
==============================================================================
--- configurations/trunk/misc/nicolas.b.pierron/common/freepopsd.nix Fri Jun
17 13:18:27 2011 (r27489)
+++ configurations/trunk/misc/nicolas.b.pierron/common/freepopsd.nix Fri Jun
17 18:02:14 2011 (r27490)
@@ -3,25 +3,6 @@
with pkgs.lib;
let
- freepops_nix = {stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline,
bison, expat}:
-
- stdenv.mkDerivation {
- name = "freepops-0.2.9";
- src = fetchurl {
- url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz;
- sha256 =
"3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
- };
- buildInputs = [pkgconfig openssl lua5 curl readline bison expat];
- configurePhase =
- ''
- export WHERE=$prefix/
- export LOCALEDIR=$prefix/share/locale/
- ./configure.sh linux
- '';
- };
-
- freepops = pkgs.callPackage freepops_nix {};
-
cfg = config.services.mail.freepopsd;
in
@@ -94,7 +75,7 @@
jobs.freepopsd = {
description = "Freepopsd (webmail over POP3)";
startOn = "ip-up";
- exec = ''${freepops}/bin/freepopsd \
+ exec = ''${pkgs.freepops}/bin/freepopsd \
-p ${toString cfg.port} \
-t ${toString cfg.threads} \
-b ${cfg.bind} \
Modified: configurations/trunk/misc/nicolas.b.pierron/common/ups.nix
==============================================================================
--- configurations/trunk/misc/nicolas.b.pierron/common/ups.nix Fri Jun 17
13:18:27 2011 (r27489)
+++ configurations/trunk/misc/nicolas.b.pierron/common/ups.nix Fri Jun 17
18:02:14 2011 (r27490)
@@ -6,27 +6,6 @@
let
cfg = config.power.ups;
-
- nut_nix = {stdenv, fetchurl, pkgconfig, neon, libusb, hal, openssl, udev}:
-
- stdenv.mkDerivation {
- name = "nut-2.6.1";
- src = fetchurl {
- url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
- sha256 =
"f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
- };
- buildInputs = [pkgconfig neon libusb hal openssl udev];
- configureFlags = [
-# "--with-user=nut"
-# "--with-group=nut"
- "--with-all"
- "--without-snmp" # Until we have it ...
- "--without-powerman" # Until we have it ...
- "--without-cgi"
- ];
- };
-
- nut = pkgs.callPackage nut_nix {};
in
let
@@ -199,13 +178,13 @@
config = mkIf cfg.enable {
- environment.systemPackages = [ nut ];
+ environment.systemPackages = [ pkgs.nut ];
jobs.upsmon = {
description = "Uninterruptible Power Supplies (Monitor)";
startOn = "ip-up";
daemonType = "fork";
- exec = ''${nut}/sbin/upsmon'';
+ exec = ''${pkgs.nut}/sbin/upsmon'';
environment.NUT_CONFPATH = "/etc/nut/";
environment.NUT_STATEPATH = "/var/lib/nut/";
};
@@ -215,7 +194,7 @@
startOn = "started network-interfaces and upsmon";
daemonType = "fork";
# TODO: replace 'root' by another username.
- exec = ''${nut}/sbin/upsd -u root'';
+ exec = ''${pkgs.nut}/sbin/upsd -u root'';
environment.NUT_CONFPATH = "/etc/nut/";
environment.NUT_STATEPATH = "/var/lib/nut/";
};
@@ -224,14 +203,14 @@
description = "Uninterruptible Power Supplies (Register all UPS)";
startOn = "started upsd";
# TODO: replace 'root' by another username.
- exec = ''${nut}/bin/upsdrvctl -u root start'';
+ exec = ''${pkgs.nut}/bin/upsdrvctl -u root start'';
task = true;
environment.NUT_CONFPATH = "/etc/nut/";
environment.NUT_STATEPATH = "/var/lib/nut/";
};
environment.etc = [
- { source = pkgs.writeText "ups.conf"
+ { source = pkgs.writeText "nut.conf"
''
MODE = ${cfg.mode}
'';
@@ -265,7 +244,7 @@
*/
];
- power.ups.schedulerRules = mkDefault "${nut}/etc/upssched.conf.sample";
+ power.ups.schedulerRules = mkDefault
"${pkgs.nut}/etc/upssched.conf.sample";
/*
users.extraUsers = [
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
