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

Merge master into haskell-updates

parents 31d0beef c05b69b0

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -3533,6 +3533,12 @@ 
      fingerprint = "5B08 313C 6853 E5BF FA91  A817 0176 0B4F 9F53 F154";

    }];

  };

  davisrichard437 = {

    email = "davisrichard437@gmail.com";

    github = "davisrichard437";

    githubId = 85075437;

    name = "Richard Davis";

  };

  davorb = {

    email = "davor@davor.se";

    github = "davorb";
@@ -8415,6 +8421,12 @@ 
    githubId = 2422454;

    name = "Kai Wohlfahrt";

  };

  kylehendricks = {

    name = "Kyle Hendricks";

    email = "kyle-github@mail.hendricks.nu";

    github = "kylehendricks";

    githubId = 981958;

  };

  kyleondy = {

    email = "kyle@ondy.org";

    github = "KyleOndy";

nixos/modules/installer/tools/nixos-generate-config.pl

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ EOF 
    }



    # Don't emit tmpfs entry for /tmp, because it most likely comes from the

    # boot.tmpOnTmpfs option in configuration.nix (managed declaratively).

    # boot.tmp.useTmpfs option in configuration.nix (managed declaratively).

    next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs");



    # Emit the filesystem.

nixos/modules/services/cluster/kubernetes/kubelet.nix

+1 −7
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ in 
    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")

    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")

    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")

    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "containerRuntime" ] "")

  ];



  ###### interface
@@ -134,12 +135,6 @@ in 
      };

    };



    containerRuntime = mkOption {

      description = lib.mdDoc "Which container runtime type to use";

      type = enum ["docker" "remote"];

      default = "remote";

    };



    containerRuntimeEndpoint = mkOption {

      description = lib.mdDoc "Endpoint at which to find the container runtime api interface/socket";

      type = str;
@@ -331,7 +326,6 @@ in 
            ${optionalString (cfg.tlsKeyFile != null)

              "--tls-private-key-file=${cfg.tlsKeyFile}"} \

            ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \

            --container-runtime=${cfg.containerRuntime} \

            --container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \

            --cgroup-driver=systemd \

            ${cfg.extraOpts}

nixos/modules/services/networking/go-neb.nix

+1 −2
Original line number Diff line number Diff line
@@ -60,13 +60,12 @@ in { 


      serviceConfig = {

        ExecStartPre = lib.optional (cfg.secretFile != null)

          (pkgs.writeShellScript "pre-start" ''

          ("+" + pkgs.writeShellScript "pre-start" ''

            umask 077

            export $(xargs < ${cfg.secretFile})

            ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile}

            chown go-neb ${finalConfigFile}

          '');

        PermissionsStartOnly = true;

        RuntimeDirectory = "go-neb";

        ExecStart = "${pkgs.go-neb}/bin/go-neb";

        User = "go-neb";

nixos/modules/services/web-apps/mastodon.nix

+7 −0
Original line number Diff line number Diff line
@@ -587,6 +587,13 @@ in { 
            <option>services.mastodon.smtp.authenticate</option> is enabled.

        '';

      }

      {

        assertion = 1 == builtins.length

          (lib.mapAttrsToList

            (_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ])

            cfg.sidekiqProcesses);

        message = "There must be one and only one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";

      }

    ];



    environment.systemPackages = [ mastodonTootctl ];