git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo

cifs-utils: missing python3 dependency for smbinfo

commitec84cbf95fefdca62db9b277f5591c13e2723c96 authorSandro <sandro.jaeckel@gmail.com> dateWed 20 Jan 2021, 20:12 (6 years ago) parent88637a15858d84
2 files changed+14−2
nixos/tests/cifs-utils.nix+12 pkgs/os-specific/linux/cifs-utils/default.nix+2−2
nixos/tests/cifs-utils.nixnew file+12
@@ -0,0 +1,12 @@
1+import ./make-test-python.nix ({ pkgs, ... }: {
2+ name = "cifs-utils";
3+
4+ machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; };
5+
6+ testScript = ''
7+ machine.succeed("smbinfo -h")
8+ machine.succeed("smb2-quota -h")
9+ assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v")
10+ assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V")
11+ '';
12+})
pkgs/os-specific/linux/cifs-utils/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
2−, kerberos, keyutils, pam, talloc }:
2+, kerberos, keyutils, pam, talloc, python3 }:
33
44stdenv.mkDerivation rec {
55 pname = "cifs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
1414
15− buildInputs = [ kerberos keyutils pam talloc ];
15+ buildInputs = [ kerberos keyutils pam talloc python3 ];
1616
1717 configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
1818 # AC_FUNC_MALLOC is broken on cross builds.