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

* A more pragmatic solution to the missing tar manpage problem.

Browse Source 
svn path=/nixos/trunk/; revision=32770
This commit is contained in:
Eelco Dolstra 2012-03-04 15:47:44 +00:00
parent 0d39390ad4
commit 6c792b3d9e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/config/system-path.nix
View File

@ -1,7 +1,7 @@
# This module defines the packages that appear in # This module defines the packages that appear in
# /var/run/current-system/sw. # /var/run/current-system/sw.
{pkgs, config, ...}: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -9,6 +9,12 @@ let
cfg = config.environment; 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 = requiredPackages =
[ config.system.sbin.modprobe # must take precedence over module_init_tools [ config.system.sbin.modprobe # must take precedence over module_init_tools
config.system.sbin.mount # must take precedence over util-linux config.system.sbin.mount # must take precedence over util-linux
@ -29,7 +35,7 @@ let
pkgs.gnugrep pkgs.gnugrep
pkgs.gnupatch pkgs.gnupatch
pkgs.gnused pkgs.gnused
pkgs.gnutarWithMan pkgs.gnutar
pkgs.gzip pkgs.gzip
pkgs.less pkgs.less
pkgs.libcap pkgs.libcap
@ -52,6 +58,7 @@ let
pkgs.udev pkgs.udev
pkgs.usbutils pkgs.usbutils
pkgs.utillinux pkgs.utillinux
extraManpages
]; ];

2
modules/module-list.nix
View File

@ -113,7 +113,7 @@
./services/networking/bitlbee.nix ./services/networking/bitlbee.nix
./services/networking/cntlm.nix ./services/networking/cntlm.nix
./services/networking/ddclient.nix ./services/networking/ddclient.nix
./services/networking/dhclient.nix ./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix ./services/networking/dhcpd.nix
./services/networking/dnsmasq.nix ./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix ./services/networking/ejabberd.nix

5
modules/services/networking/dhcpcd.nix
View File

@ -33,6 +33,9 @@ let
# Ethernet cards used for bridging. Likewise for vif* and tap* # Ethernet cards used for bridging. Likewise for vif* and tap*
# (Xen) and virbr* and vnet* (libvirt). # (Xen) and virbr* and vnet* (libvirt).
denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* 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. # Hook for emitting ip-up/ip-down events.
@ -72,7 +75,7 @@ in
path = [ dhcpcd pkgs.nettools pkgs.openresolv ]; path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent"; exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
}; };
environment.systemPackages = [ dhcpcd ]; environment.systemPackages = [ dhcpcd ];