diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2021-01-20 09:38:09 +0100 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2021-01-20 18:39:42 +0100 |
| commit | 5858d8465821eae15c72c148b5734a3af8687b56 (patch) | |
| tree | 18c2bb3778be8569456ddb6a8a694f6a3bd67fa2 | |
| parent | 35ad1687a73228b11c778eb102e05d0a23e014ab (diff) | |
| download | nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar.gz nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar.bz2 nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar.lz nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar.xz nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.tar.zst nixpkgs-5858d8465821eae15c72c148b5734a3af8687b56.zip | |
cifs-utils: missing python3 dependency for smbinfo
Since cifs-utils 6.12, smbinfo needs Python to be usable. Issue introduced in 033208fd46e03178655f3c4a59add1d9dbf57731.
| -rw-r--r-- | nixos/tests/cifs-utils.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/cifs-utils/default.nix | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/nixos/tests/cifs-utils.nix b/nixos/tests/cifs-utils.nix new file mode 100644 index 00000000000..98587b10d94 --- /dev/null +++ b/nixos/tests/cifs-utils.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cifs-utils"; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; }; + + testScript = '' + machine.succeed("smbinfo -h") + machine.succeed("smb2-quota -h") + assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v") + assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V") + ''; +}) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index dcffe770dee..c4ed4d4fc0f 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config -, kerberos, keyutils, pam, talloc }: +, kerberos, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc ]; + buildInputs = [ kerberos keyutils pam talloc python3 ]; configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. |