diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 15:28:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 15:35:59 +0200 |
| commit | 0645f5eab7b98e57cbbf51cab7fc77b4762b44b7 (patch) | |
| tree | 3aab77d878900ab16376378cff5dfd689e082def /pkgs/os-specific/gnu | |
| parent | 789f20eba860b769d7153afab42a70fe50688185 (diff) | |
| download | nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar.gz nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar.bz2 nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar.lz nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar.xz nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.tar.zst nixlib-0645f5eab7b98e57cbbf51cab7fc77b4762b44b7.zip | |
samba: Revert style changes and get rid of some dependencies
Packages like glusterfs are now optional dependencies. A bunch of dependencies like subunit are gone: as far as I can tell, these are only used by Samba's test suite, which we're not even running, so they're pointless. Fixes #8067.
Diffstat (limited to 'pkgs/os-specific/gnu')
| -rw-r--r-- | pkgs/os-specific/gnu/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 94bfec0a18ec..457b670319e0 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -1,7 +1,7 @@ # Packages that make up the GNU/Hurd operating system (aka. GNU). args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool -, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light +, texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gccCrossStageFinal , forceNativeDrv, forceSystem, newScope, platform, config, crossSystem , overrides ? {} }: @@ -91,7 +91,6 @@ let mig_raw = callPackage ./mig {}; smbfs = callPackage ./smbfs { - samba = samba_light; hurd = gnu.hurdCross; }; |