From f1fb3651d87f992879ac9e9c0c561c9c0421c0cc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Apr 2018 10:41:46 -0500 Subject: [PATCH] quota: get from unixtools --- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/unix-tools.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 906394366a3a..42a0b4f91975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3491,6 +3491,8 @@ with pkgs; limesurvey = callPackage ../servers/limesurvey { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { @@ -4512,7 +4514,7 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; - linuxquota = callPackage ../tools/misc/linuxquota { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; wiggle = callPackage ../development/tools/wiggle { }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 978d30ec0e77..439395efdf5f 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -92,7 +92,7 @@ in rec { darwin = pkgs.darwin.ps; }; quota = singleBinary "quota" { - linux = pkgs.utillinux; + linux = pkgs.linuxquota; darwin = pkgs.darwin.diskdev_cmds; }; route = singleBinary "route" {