Author: eelco
Date: Sun Mar 4 15:47:44 2012
New Revision: 32770
URL: https://nixos.org/websvn/nix/?rev=32770&sc=1
Log:
* A more pragmatic solution to the missing tar manpage problem.
Modified:
nixos/trunk/modules/config/system-path.nix
nixos/trunk/modules/module-list.nix
nixos/trunk/modules/services/networking/dhcpcd.nix
Modified: nixos/trunk/modules/config/system-path.nix
==============================================================================
--- nixos/trunk/modules/config/system-path.nix Sun Mar 4 15:34:44 2012
(r32769)
+++ nixos/trunk/modules/config/system-path.nix Sun Mar 4 15:47:44 2012
(r32770)
@@ -1,7 +1,7 @@
# This module defines the packages that appear in
# /var/run/current-system/sw.
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
with pkgs.lib;
@@ -9,6 +9,12 @@
cfg = config.environment;
+ extraManpages = pkgs.runCommand "extra-manpages" { buildInputs = [
pkgs.help2man ]; }
+ ''
+ mkdir -p $out/share/man/man1
+ help2man ${pkgs.gnutar}/bin/tar > $out/share/man/man1/tar.1
+ '';
+
requiredPackages =
[ config.system.sbin.modprobe # must take precedence over module_init_tools
config.system.sbin.mount # must take precedence over util-linux
@@ -29,7 +35,7 @@
pkgs.gnugrep
pkgs.gnupatch
pkgs.gnused
- pkgs.gnutarWithMan
+ pkgs.gnutar
pkgs.gzip
pkgs.less
pkgs.libcap
@@ -52,6 +58,7 @@
pkgs.udev
pkgs.usbutils
pkgs.utillinux
+ extraManpages
];
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Sun Mar 4 15:34:44 2012 (r32769)
+++ nixos/trunk/modules/module-list.nix Sun Mar 4 15:47:44 2012 (r32770)
@@ -113,7 +113,7 @@
./services/networking/bitlbee.nix
./services/networking/cntlm.nix
./services/networking/ddclient.nix
- ./services/networking/dhclient.nix
+ ./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
Modified: nixos/trunk/modules/services/networking/dhcpcd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhcpcd.nix Sun Mar 4 15:34:44
2012 (r32769)
+++ nixos/trunk/modules/services/networking/dhcpcd.nix Sun Mar 4 15:47:44
2012 (r32770)
@@ -33,6 +33,9 @@
# Ethernet cards used for bridging. Likewise for vif* and tap*
# (Xen) and virbr* and vnet* (libvirt).
denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr*
vnet* vboxnet*
+
+ # Disable listening for IPv6 Router Advertisements for now.
+ noipv6rs
'';
# Hook for emitting ip-up/ip-down events.
@@ -72,7 +75,7 @@
path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
- exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
+ exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
};
environment.systemPackages = [ dhcpcd ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
