Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88637a1c33a5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec84cbf95fef
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 20, 2021

  1. cifs-utils: missing python3 dependency for smbinfo 

    Since cifs-utils 6.12, smbinfo needs Python to be usable.

Issue introduced in 033208f.
    @LeSuisse
    LeSuisse committed Jan 20, 2021
    Copy the full SHA
    5858d84 View commit details

  2. Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-s… 

    …mbinfo

cifs-utils: missing python3 dependency for smbinfo
    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec84cbf View commit details
Showing with 14 additions and 2 deletions.
  1. +12 −0 nixos/tests/cifs-utils.nix
  2. +2 −2 pkgs/os-specific/linux/cifs-utils/default.nix
12 changes: 12 additions & 0 deletions nixos/tests/cifs-utils.nix
View file
Original file line number Diff line number Diff line change
@@ -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")
'';
})
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/cifs-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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.