Unverified Commit a4b5a14b authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 0a95fd24 7b1be1e6
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -8,7 +8,15 @@ name: Check pkgs/by-name
# see pkgs/test/nixpkgs-check-by-name/scripts/README.md
on:
  # Using pull_request_target instead of pull_request avoids having to approve first time contributors
  pull_request_target
  pull_request_target:
    # This workflow depends on the base branch of the PR,
    # but changing the base branch is not included in the default trigger events,
    # which would be `opened`, `synchronize` or `reopened`.
    # Instead it causes an `edited` event, so we need to add it explicitly here
    # While `edited` is also triggered when the PR title/body is changed,
    # this PR action is fairly quick, and PR's don't get edited that often,
    # so it shouldn't be a problem
    types: [opened, synchronize, reopened, edited]

permissions:
  # We need this permission to cancel the workflow run if there's a merge conflict
+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ The file system can be configured in NixOS via the usual [fileSystems](#opt-file
Here's a typical setup:
```nix
{
  system.fsPackages = [ pkgs.sshfs ];

  fileSystems."/mnt/my-dir" = {
    device = "my-user@example.com:/my-dir/";
    fsType = "sshfs";
+1 −0
Original line number Diff line number Diff line
@@ -1519,6 +1519,7 @@
  ./tasks/filesystems/nfs.nix
  ./tasks/filesystems/ntfs.nix
  ./tasks/filesystems/reiserfs.nix
  ./tasks/filesystems/sshfs.nix
  ./tasks/filesystems/squashfs.nix
  ./tasks/filesystems/unionfs-fuse.nix
  ./tasks/filesystems/vboxsf.nix
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ let
    "fwupd/fwupd.conf" = {
      source = format.generate "fwupd.conf" {
        fwupd = cfg.daemonSettings;
      } // lib.optionalAttrs (lib.length (lib.attrNames cfg.uefiCapsuleSettings) != 0) {
        uefi_capsule = cfg.uefiCapsuleSettings;
      };
      # fwupd tries to chmod the file if it doesn't have the right permissions
+7 −0
Original line number Diff line number Diff line
{ config, lib, pkgs, ... }:

{
  config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) {
    system.fsPackages = [ pkgs.sshfs ];
  };
}
Loading