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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-10 18:28:17 +00:00
committed by GitHub
parent 115881e756 4f675ad255
commit 61fa3fdde8
110 changed files with 899 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
-14
View File
@@ -1,14 +0,0 @@
{ config, ... }:
{
imports = [
../sd-card/sd-image-raspberrypi4-installer.nix
];
config = {
warnings = [
''
.../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed.
Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead.
''
];
};
}
nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix
-10
View File
@@ -1,10 +0,0 @@
{
imports = [
../../profiles/installation-device.nix
./sd-image-raspberrypi4.nix
];
# the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false;
}
nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
-8
View File
@@ -1,8 +0,0 @@
# To build, use:
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
{
imports = [ ./sd-image-aarch64.nix ];
boot.kernelPackages = pkgs.linuxPackages_rpi4;
}
nixos/modules/services/networking/bind.nix
+12 -11
View File
@@ -32,7 +32,7 @@ let
slaves = mkOption {
type = types.listOf types.str;
description = "Addresses who may request zone transfers.";
default = [];
default = [ ];
};
extraConfig = mkOption {
type = types.str;
@@ -105,7 +105,7 @@ in
enable = mkEnableOption "BIND domain name server";
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];
default = [ "127.0.0.0/24" ];
type = types.listOf types.str;
description = "
What networks are allowed to use us as a resolver. Note
@@ -117,7 +117,7 @@ in
};
blockedNetworks = mkOption {
default = [];
default = [ ];
type = types.listOf types.str;
description = "
What networks are just blocked.
@@ -141,7 +141,7 @@ in
};
listenOn = mkOption {
default = ["any"];
default = [ "any" ];
type = types.listOf types.str;
description = "
Interfaces to listen on.
@@ -149,7 +149,7 @@ in
};
listenOnIpv6 = mkOption {
default = ["any"];
default = [ "any" ];
type = types.listOf types.str;
description = "
Ipv6 interfaces to listen on.
@@ -157,7 +157,7 @@ in
};
zones = mkOption {
default = [];
default = [ ];
type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions));
description = "
List of zones we claim authority over.
@@ -166,8 +166,8 @@ in
"example.com" = {
master = false;
file = "/var/dns/example.com";
masters = ["192.168.0.1"];
slaves = [];
masters = [ "192.168.0.1" ];
slaves = [ ];
extraConfig = "";
};
};
@@ -212,7 +212,8 @@ in
networking.resolvconf.useLocalResolver = mkDefault true;
users.users.${bindUser} =
{ uid = config.ids.uids.bind;
{
uid = config.ids.uids.bind;
description = "BIND daemon user";
};
@@ -232,9 +233,9 @@ in
'';
serviceConfig = {
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
};
unitConfig.Documentation = "man:named(8)";
nixos/release.nix
-5
View File
@@ -186,11 +186,6 @@ in rec {
inherit system;
});
sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix;
inherit system;
});
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = forMatchingSystems [ "x86_64-linux" ] (system: