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

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-02 00:03:12 +00:00 committed by GitHub
commit abbdf9574b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -644,7 +644,11 @@ in
]; ];
fileSystems."/" = fileSystems."/" =
{ fsType = "tmpfs"; # This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
options = [ "mode=0755" ]; options = [ "mode=0755" ];
}; };

6
nixos/modules/installer/netboot/netboot.nix
View File

@ -30,7 +30,11 @@ with lib;
else [ pkgs.grub2 pkgs.syslinux ]); else [ pkgs.grub2 pkgs.syslinux ]);
fileSystems."/" = fileSystems."/" =
{ fsType = "tmpfs"; # This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
options = [ "mode=0755" ]; options = [ "mode=0755" ];
}; };

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -458,7 +458,7 @@ in
description = "The flake reference to which <option>from></option> is to be rewritten."; description = "The flake reference to which <option>from></option> is to be rewritten.";
}; };
flake = mkOption { flake = mkOption {
type = types.unspecified; type = types.nullOr types.attrs;
default = null; default = null;
example = literalExample "nixpkgs"; example = literalExample "nixpkgs";
description = '' description = ''