movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nfs-utils: align attrname with pkgname

Browse source 
nfsUtils => nfs-utils. Keep copy of old attribute for backward
compatibility.
This commit is contained in:
Bjørn Forsman 2014-12-06 16:40:57 +01:00
parent 748b335256
commit f85ad2d378
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/autofs.nix
View file

@ -84,7 +84,7 @@ in
startOn = "started network-interfaces"; startOn = "started network-interfaces";
stopOn = "stopping network-interfaces"; stopOn = "stopping network-interfaces";
path = [ pkgs.nfsUtils pkgs.sshfsFuse ]; path = [ pkgs.nfs-utils pkgs.sshfsFuse ];
preStop = preStop =
'' ''

8
nixos/modules/services/network-filesystems/nfsd.nix
View file

@ -86,7 +86,7 @@ in
boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd
environment.systemPackages = [ pkgs.nfsUtils ]; environment.systemPackages = [ pkgs.nfs-utils ];
environment.etc = singleton environment.etc = singleton
{ source = exports; { source = exports;
@ -104,7 +104,7 @@ in
after = [ "rpcbind.service" "mountd.service" "idmapd.service" ]; after = [ "rpcbind.service" "mountd.service" "idmapd.service" ];
before = [ "statd.service" ]; before = [ "statd.service" ];
path = [ pkgs.nfsUtils ]; path = [ pkgs.nfs-utils ];
script = script =
'' ''
@ -131,7 +131,7 @@ in
requires = [ "rpcbind.service" ]; requires = [ "rpcbind.service" ];
after = [ "rpcbind.service" ]; after = [ "rpcbind.service" ];
path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ]; path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
preStart = preStart =
'' ''
@ -157,7 +157,7 @@ in
serviceConfig.Type = "forking"; serviceConfig.Type = "forking";
serviceConfig.ExecStart = '' serviceConfig.ExecStart = ''
@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \ @${pkgs.nfs-utils}/sbin/rpc.mountd rpc.mountd \
${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""} ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""}
''; '';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";

8
nixos/modules/tasks/filesystems/nfs.nix
View file

@ -58,7 +58,7 @@ in
services.rpcbind.enable = true; services.rpcbind.enable = true;
system.fsPackages = [ pkgs.nfsUtils ]; system.fsPackages = [ pkgs.nfs-utils ];
boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) '' boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) ''
options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
@ -71,7 +71,7 @@ in
systemd.services.statd = systemd.services.statd =
{ description = "NFSv3 Network Status Monitor"; { description = "NFSv3 Network Status Monitor";
path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ]; path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
wantedBy = [ "remote-fs-pre.target" ]; wantedBy = [ "remote-fs-pre.target" ];
before = [ "remote-fs-pre.target" ]; before = [ "remote-fs-pre.target" ];
@ -89,7 +89,7 @@ in
serviceConfig.Type = "forking"; serviceConfig.Type = "forking";
serviceConfig.ExecStart = '' serviceConfig.ExecStart = ''
@${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \ @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \
${if cfg.statdPort != null then "-p ${toString statdPort}" else ""} ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""}
''; '';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@ -117,7 +117,7 @@ in
''; '';
serviceConfig.Type = "forking"; serviceConfig.Type = "forking";
serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}"; serviceConfig.ExecStart = "@${pkgs.nfs-utils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}";
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
}; };

3
pkgs/top-level/all-packages.nix
View file

@ -7912,7 +7912,7 @@ let
_915resolution = callPackage ../os-specific/linux/915resolution { }; _915resolution = callPackage ../os-specific/linux/915resolution { };
nfsUtils = callPackage ../os-specific/linux/nfs-utils { }; nfs-utils = callPackage ../os-specific/linux/nfs-utils { };
acpi = callPackage ../os-specific/linux/acpi { }; acpi = callPackage ../os-specific/linux/acpi { };
@ -12909,6 +12909,7 @@ let
rdiff_backup = rdiff-backup; # added 2014-11-23 rdiff_backup = rdiff-backup; # added 2014-11-23
htmlTidy = html-tidy; # added 2014-12-06 htmlTidy = html-tidy; # added 2014-12-06
sqliteInteractive = sqlite-interactive; # added 2014-12-06 sqliteInteractive = sqlite-interactive; # added 2014-12-06
nfsUtils = nfs-utils; # added 2014-12-06
opentsdb = callPackage ../tools/misc/opentsdb {}; opentsdb = callPackage ../tools/misc/opentsdb {};

2
pkgs/top-level/release-small.nix
View file

@ -119,7 +119,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
mysql51 = linux; mysql51 = linux;
ncat = linux; ncat = linux;
netcat = all; netcat = all;
nfsUtils = linux; nfs-utils = linux;
nix = all; nix = all;
nixUnstable = all; nixUnstable = all;
nss_ldap = linux; nss_ldap = linux;