JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with allowAliases=false

Browse Source
This commit is contained in:
volth 2018-07-22 23:52:54 +00:00
parent 18d0ed20e8
commit 92b3e8f147
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/config/pulseaudio.nix
View File

@ -144,8 +144,8 @@ in {
package = mkOption {
type = types.package;
default = pulseaudioLight;
defaultText = "pkgs.pulseaudioLight";
default = pkgs.pulseaudio;
defaultText = "pkgs.pulseaudio";
example = literalExample "pkgs.pulseaudioFull";
description = ''
The PulseAudio derivation to use. This can be used to enable

4
nixos/modules/config/users-groups.nix
View File

@ -120,8 +120,8 @@ let
shell = mkOption {
type = types.either types.shellPackage types.path;
default = pkgs.nologin;
defaultText = "pkgs.nologin";
default = pkgs.shadow;
defaultText = "pkgs.shadow";
example = literalExample "pkgs.bashInteractive";
description = ''
The path to the user's shell. Can use shell derivations,

2
nixos/modules/virtualisation/libvirtd.nix
View File

@ -104,7 +104,7 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ];
environment.systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];
boot.kernelModules = [ "tun" ];

4
nixos/tests/common/letsencrypt/default.nix
View File

@ -304,7 +304,7 @@ let
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
script = let
netcat = "${pkgs.netcat-openbsd}/bin/nc";
netcat = "${pkgs.libressl.nc}/bin/nc";
portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}";
in "while ! ${portCheck}; do :; done";
};
@ -435,7 +435,7 @@ in {
serviceConfig.RemainAfterExit = true;
script = let
ports = lib.range 8000 8005 ++ lib.singleton 80;
netcat = "${pkgs.netcat-openbsd}/bin/nc";
netcat = "${pkgs.libressl.nc}/bin/nc";
mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}";
checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})";
in "while ! ${checks}; do :; done";