Commit bd833555 authored by sternenseemann's avatar sternenseemann
Browse files

Merge remote-tracking branch 'origin/master' into haskell-updates

parents dd6a74bd a1386a8f

lib/systems/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ rec { 
        ({

          linux-kernel = args.linux-kernel or {};

          gcc = args.gcc or {};

          rustc = args.rust or {};

          rustc = args.rustc or {};

        } // platforms.select final)

        linux-kernel gcc rustc;

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -6222,6 +6222,12 @@ 
    githubId = 982322;

    name = "Henrik Olsson";

  };

  henrirosten = {

    email = "henri.rosten@unikie.com";

    github = "henrirosten";

    githubId = 49935860;

    name = "Henri Rosten";

  };

  henrytill = {

    email = "henrytill@gmail.com";

    github = "henrytill";
@@ -9041,6 +9047,12 @@ 
      fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";

    }];

  };

  lizelive = {

    email = "nixpkgs@lize.live";

    github = "lizelive";

    githubId = 40217331;

    name = "LizeLive";

  };

  lluchs = {

    email = "lukas.werling@gmail.com";

    github = "lluchs";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ with lib.maintainers; { 


  cuda = {

    members = [

      connorbaker

      SomeoneSerge

    ];

    scope = "Maintain CUDA-enabled packages";

nixos/modules/services/monitoring/uptime-kuma.nix

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ in 
    services.uptime-kuma.settings = {

      DATA_DIR = "/var/lib/uptime-kuma/";

      NODE_ENV = mkDefault "production";

      HOST = mkDefault "127.0.0.1";

      PORT = mkDefault "3001";

    };



    systemd.services.uptime-kuma = {

nixos/modules/services/network-filesystems/webdav-server-rs.nix

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ in 
        description = lib.mdDoc "Group to run under when setuid is not enabled.";

      };



      debug = mkOption {

        type = types.bool;

        default = false;

        description = lib.mdDoc "Enable debug mode.";

      };



      settings = mkOption {

        type = format.type;

        default = { };
@@ -111,7 +117,7 @@ in 
      after = [ "network.target" ];

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

      serviceConfig = {

        ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server -c ${cfg.configFile}";

        ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server ${lib.optionalString cfg.debug "--debug"} -c ${cfg.configFile}";



        CapabilityBoundingSet = [

          "CAP_SETUID"