Commit 50848d12 authored by sternenseemann's avatar sternenseemann
Browse files

Merge branch master into haskell-updates

parents 1a818e31 2c32ee39

nixos/modules/hardware/video/nvidia.nix

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ in 
            KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 1'"

          '';

          hardware.opengl = {

            extraPackages = [ nvidia_x11.out ] ++ (lib.optional (builtins.hasAttr "libXNVCtrl" nvidia_x11.settings) nvidia_x11.settings.libXNVCtrl);

            extraPackages = [ nvidia_x11.out ];

            extraPackages32 = [ nvidia_x11.lib32 ];

          };

          environment.systemPackages = [ nvidia_x11.bin ];

nixos/modules/services/misc/open-webui.nix

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ in 
      environment = {

        STATIC_DIR = ".";

        DATA_DIR = ".";

        HF_HOME = ".";

        SENTENCE_TRANSFORMERS_HOME = ".";

      } // cfg.environment;



      serviceConfig = {

nixos/modules/services/network-filesystems/davfs2.nix

+4 −46
Original line number Diff line number Diff line
@@ -20,14 +20,10 @@ let 
    else toString value;



  configFile = pkgs.writeText "davfs2.conf" (

    if (cfg.settings != { }) then

      (toINIWithGlobalSection {

    toINIWithGlobalSection {

      mkSectionName = escapeString;

      mkKeyValue = k: v: "${k} ${formatValue v}";

      } cfg.settings)

    else

      cfg.extraConfig

  );

    } cfg.settings);

in

{
@@ -53,29 +49,6 @@ in 
      '';

    };



    extraConfig = mkOption {

      type = lines;

      default = "";

      example = ''

        proxy foo.bar:8080

        use_locks 0



        [/media/dav]

        use_locks 1



        [/home/otto/mywebspace]

        gui_optimize 1

      '';

      description = ''

        Extra lines appended to the configuration of davfs2.

        See {manpage}`davfs2.conf(5)` for available settings.



        **Note**: Please pass structured settings via

        {option}`settings` instead, this option

        will get deprecated in the future.

      ''  ;

    };



    settings = mkOption {

      type = submodule {

        freeformType = let
@@ -109,21 +82,6 @@ in 


  config = mkIf cfg.enable {



    assertions = [

      {

        assertion = cfg.extraConfig != "" -> cfg.settings == { };

        message = ''

          services.davfs2.extraConfig and services.davfs2.settings cannot be used together.

          Please prefer using services.davfs2.settings.

        '';

      }

    ];



    warnings = optional (cfg.extraConfig != "") ''

      services.davfs2.extraConfig will be deprecated in future releases;

      please use services.davfs2.settings instead.

    '';



    environment.systemPackages = [ pkgs.davfs2 ];

    environment.etc."davfs2/davfs2.conf".source = configFile;

nixos/modules/services/networking/mycelium.nix

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ in 
    networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ 9651 ];

    networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 9650 9651 ];



    environment.systemPackages = [ cfg.package ];



    systemd.services.mycelium = {

      description = "Mycelium network";

      after = [ "network.target" ];

nixos/tests/mycelium/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ in 
      peer1.wait_for_unit("mycelium.service")

      peer2.wait_for_unit("mycelium.service")



      peer1.succeed("mycelium peers list | grep 192.168.1.12")

      peer2.succeed("mycelium peers list | grep 192.168.1.11")



      peer1.succeed("ping -c5 ${peer2-ip}")

      peer2.succeed("ping -c5 ${peer1-ip}")

    '';