commit f85ad2d378a4501c4597b2980993fb11f32a4af4 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/autofs.nix

···

       84
       84
        
               startOn = "started network-interfaces";

     

       85
       85
        
               stopOn = "stopping network-interfaces";

     

       86
       86
        
       

     

       87
       87
       -
               path = [ pkgs.nfsUtils pkgs.sshfsFuse ];

     

       87
       87
       +
               path = [ pkgs.nfs-utils pkgs.sshfsFuse ];

     

       88
       88
        
       

     

       89
       89
        
               preStop =

     

       90
       90
        
                 ''

+4 -4

nixos/modules/services/network-filesystems/nfsd.nix

···

       86
       86
        
       

     

       87
       87
        
           boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd

     

       88
       88
        
       

     

       89
       89
       -
           environment.systemPackages = [ pkgs.nfsUtils ];

     

       89
       89
       +
           environment.systemPackages = [ pkgs.nfs-utils ];

     

       90
       90
        
       

     

       91
       91
        
           environment.etc = singleton

     

       92
       92
        
             { source = exports;

     
···

       104
       104
        
               after = [ "rpcbind.service" "mountd.service" "idmapd.service" ];

     

       105
       105
        
               before = [ "statd.service" ];

     

       106
       106
        
       

     

       107
       107
       -
               path = [ pkgs.nfsUtils ];

     

       107
       107
       +
               path = [ pkgs.nfs-utils ];

     

       108
       108
        
       

     

       109
       109
        
               script =

     

       110
       110
        
                 ''

     
···

       131
       131
        
               requires = [ "rpcbind.service" ];

     

       132
       132
        
               after = [ "rpcbind.service" ];

     

       133
       133
        
       

     

       134
       134
       -
               path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];

     

       134
       134
       +
               path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];

     

       135
       135
        
       

     

       136
       136
        
               preStart =

     

       137
       137
        
                 ''

     
···

       157
       157
        
       

     

       158
       158
        
               serviceConfig.Type = "forking";

     

       159
       159
        
               serviceConfig.ExecStart = ''

     

       160
       160
       -
                 @${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \

     

       160
       160
       +
                 @${pkgs.nfs-utils}/sbin/rpc.mountd rpc.mountd \

     

       161
       161
        
                     ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""}

     

       162
       162
        
               '';

     

       163
       163
        
               serviceConfig.Restart = "always";

+4 -4

nixos/modules/tasks/filesystems/nfs.nix

···

       58
       58
        
       

     

       59
       59
        
           services.rpcbind.enable = true;

     

       60
       60
        
       

     

       61
       61
       -
           system.fsPackages = [ pkgs.nfsUtils ];

     

       61
       61
       +
           system.fsPackages = [ pkgs.nfs-utils ];

     

       62
       62
        
       

     

       63
       63
        
           boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) ''

     

       64
       64
        
             options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}

     
···

       71
       71
        
           systemd.services.statd =

     

       72
       72
        
             { description = "NFSv3 Network Status Monitor";

     

       73
       73
        
       

     

       74
       74
       -
               path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];

     

       74
       74
       +
               path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];

     

       75
       75
        
       

     

       76
       76
        
               wantedBy = [ "remote-fs-pre.target" ];

     

       77
       77
        
               before = [ "remote-fs-pre.target" ];

     
···

       89
       89
        
       

     

       90
       90
        
               serviceConfig.Type = "forking";

     

       91
       91
        
               serviceConfig.ExecStart = ''

     

       92
       92
       -
                 @${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \

     

       92
       92
       +
                 @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \

     

       93
       93
        
                     ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""}

     

       94
       94
        
               '';

     

       95
       95
        
               serviceConfig.Restart = "always";

     
···

       117
       117
        
                 '';

     

       118
       118
        
       

     

       119
       119
        
               serviceConfig.Type = "forking";

     

       120
       120
       -
               serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}";

     

       120
       120
       +
               serviceConfig.ExecStart = "@${pkgs.nfs-utils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}";

     

       121
       121
        
               serviceConfig.Restart = "always";

     

       122
       122
        
             };

     

       123
       123

+2 -1

pkgs/top-level/all-packages.nix

···

       7912
       7912
        
       

     

       7913
       7913
        
         _915resolution = callPackage ../os-specific/linux/915resolution { };

     

       7914
       7914
        
       

     

       7915
       7915
       -
         nfsUtils = callPackage ../os-specific/linux/nfs-utils { };

     

       7915
       7915
       +
         nfs-utils = callPackage ../os-specific/linux/nfs-utils { };

     

       7916
       7916
        
       

     

       7917
       7917
        
         acpi = callPackage ../os-specific/linux/acpi { };

     

       7918
       7918
        
       

     
···

       12909
       12909
        
         rdiff_backup = rdiff-backup;  # added 2014-11-23

     

       12910
       12910
        
         htmlTidy = html-tidy;  # added 2014-12-06

     

       12911
       12911
        
         sqliteInteractive = sqlite-interactive;  # added 2014-12-06

     

       12912
       12912
       +
         nfsUtils = nfs-utils;  # added 2014-12-06

     

       12912
       12913
        
       

     

       12913
       12914
        
         opentsdb = callPackage ../tools/misc/opentsdb {};

     

       12914
       12915

+1 -1

pkgs/top-level/release-small.nix

···

       119
       119
        
         mysql51 = linux;

     

       120
       120
        
         ncat = linux;

     

       121
       121
        
         netcat = all;

     

       122
       122
       -
         nfsUtils = linux;

     

       122
       122
       +
         nfs-utils = linux;

     

       123
       123
        
         nix = all;

     

       124
       124
        
         nixUnstable = all;

     

       125
       125
        
         nss_ldap = linux;