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

Merge master into staging-next

parents b90f20aa 79ed655a

maintainers/maintainer-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -2480,6 +2480,7 @@ 
  };

  bbenno = {

    email = "nix@bbenno.com";

    matrix = "@bbenno:matrix.org";

    github = "bbenno";

    githubId = 32938211;

    name = "Benno Bielmeier";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
  ./programs/cpu-energy-meter.nix

  ./programs/command-not-found/command-not-found.nix

  ./programs/coolercontrol.nix

  ./programs/corefreq.nix

  ./programs/criu.nix

  ./programs/darling.nix

  ./programs/dconf.nix

nixos/modules/programs/corefreq.nix

0 → 100644
+42 −0
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:



let

  cfg = config.programs.corefreq;

  kernelPackages = config.boot.kernelPackages;

in

{

  options = {

    programs.corefreq = {

      enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module";



      package = lib.mkOption {

        type = lib.types.package;

        default = kernelPackages.corefreq;

        defaultText = lib.literalExpression "config.boot.kernelPackages.corefreq";

        description = ''

          The corefreq package to use.

        '';

      };

    };

  };



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];

    boot.extraModulePackages = [ cfg.package ];

    boot.kernelModules = [ "corefreqk" ];



    # Create a systemd service for the corefreq daemon

    systemd.services.corefreq = {

      description = "CoreFreq daemon";

      wantedBy = [ "multi-user.target" ];

      serviceConfig = {

        ExecStart = lib.getExe' cfg.package "corefreqd";

      };

    };

  };

}

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

+12 −4
Original line number Diff line number Diff line
@@ -35,13 +35,21 @@ in 
    };



    dataDir = mkOption {

      type = types.str;

      type = types.path;

      default = "/var/lib/sftpgo";

      description = ''

        The directory where SFTPGo stores its data files.

      '';

    };



    extraReadWriteDirs = mkOption {

      type = types.listOf types.path;

      default = [];

      description = ''

        Extra directories where SFTPGo is allowed to write to.

      '';

    };



    user = mkOption {

      type = types.str;

      default = defaultUser;
@@ -63,7 +71,7 @@ in 
      type = with types; nullOr path;

      description = ''

        Path to a json file containing users and folders to load (or update) on startup.

        Check the [documentation](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md)

        Check the [documentation](https://sftpgo.github.io/latest/config-file/)

        for the `--loaddata-from` command line argument for more info.

      '';

    };
@@ -72,7 +80,7 @@ in 
      default = {};

      description = ''

        The primary sftpgo configuration. See the

        [configuration reference](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md)

        [configuration reference](https://sftpgo.github.io/latest/config-file/)

        for possible values.

      '';

      type = with types; submodule {
@@ -324,7 +332,7 @@ in 
          User = cfg.user;

          Group = cfg.group;

          WorkingDirectory = cfg.dataDir;

          ReadWritePaths = [ cfg.dataDir ];

          ReadWritePaths = [ cfg.dataDir ] ++ cfg.extraReadWriteDirs;

          LimitNOFILE = 8192; # taken from upstream

          KillMode = "mixed";

          ExecStart = "${cfg.package}/bin/sftpgo serve ${utils.escapeSystemdExecArgs cfg.extraArgs}";

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 


stdenv.mkDerivation rec {

  pname = "bitwig-studio";

  version = "5.2.4";

  version = "5.2.5";



  src = fetchurl {

    url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";

    hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw=";

    hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";

  };



  nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];