alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

quota: get from unixtools

Browse source
This commit is contained in:
Matthew Bauer 2018-04-13 10:41:46 -05:00
parent 47fdc26c26
commit f1fb3651d8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3491,6 +3491,8 @@ with pkgs;
limesurvey = callPackage ../servers/limesurvey { }; limesurvey = callPackage ../servers/limesurvey { };
linuxquota = callPackage ../tools/misc/linuxquota { };
localtime = callPackage ../tools/system/localtime { }; localtime = callPackage ../tools/system/localtime { };
logcheck = callPackage ../tools/system/logcheck { logcheck = callPackage ../tools/system/logcheck {
@ -4512,7 +4514,7 @@ with pkgs;
quilt = callPackage ../development/tools/quilt { }; quilt = callPackage ../development/tools/quilt { };
linuxquota = callPackage ../tools/misc/linuxquota { }; quota = if stdenv.isLinux then linuxquota else unixtools.quota;
wiggle = callPackage ../development/tools/wiggle { }; wiggle = callPackage ../development/tools/wiggle { };

2
pkgs/top-level/unix-tools.nix
View file

@ -92,7 +92,7 @@ in rec {
darwin = pkgs.darwin.ps; darwin = pkgs.darwin.ps;
}; };
quota = singleBinary "quota" { quota = singleBinary "quota" {
linux = pkgs.utillinux; linux = pkgs.linuxquota;
darwin = pkgs.darwin.diskdev_cmds; darwin = pkgs.darwin.diskdev_cmds;
}; };
route = singleBinary "route" { route = singleBinary "route" {