Unverified Commit d8e274d2 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents a235a4c8 5fd3c32b

nixos/modules/config/xdg/portals/wlr.nix

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ in 
            exec_before = "disable_notifications.sh";

            exec_after = "enable_notifications.sh";

            chooser_type = "simple";

            chooser_cmd = "''${pkgs.slurp}/bin/slurp -f %o -or";

            chooser_cmd = "''${pkgs.slurp}/bin/slurp -f 'Monitor: %o' -or";

          };

        }

      '';

nixos/modules/services/misc/ollama.nix

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ in 
            false

            "rocm"

            "cuda"

            "vulkan"

          ]

        );

        default = null;
@@ -119,6 +120,7 @@ in 
            - may require overriding gpu type with `services.ollama.rocmOverrideGfx`

              if rocm doesn't detect your AMD gpu

          - `"cuda"`: supported by most modern NVIDIA GPUs

          - `"vulkan"`: supported by most modern GPUs on Linux

        '';

      };

      rocmOverrideGfx = lib.mkOption {

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -1145,6 +1145,7 @@ in 
  ollama = runTest ./ollama.nix;

  ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;

  ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;

  ollama-vulkan = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-vulkan.nix;

  ombi = runTest ./ombi.nix;

  omnom = runTest ./omnom;

  oncall = runTest ./web-apps/oncall.nix;

nixos/tests/ollama-vulkan.nix

0 → 100644
+17 −0
Original line number Diff line number Diff line 
{ lib, ... }:

{

  name = "ollama-vulkan";

  meta.maintainers = with lib.maintainers; [ abysssol ];



  nodes.vulkan =

    { ... }:

    {

      services.ollama.enable = true;

      services.ollama.acceleration = "vulkan";

    };



  testScript = ''

    vulkan.wait_for_unit("multi-user.target")

    vulkan.wait_for_open_port(11434)

  '';

}

nixos/tests/prometheus/pushgateway.nix

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
      + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'"

    )



    client.systemctl("start network-online.target")

    client.wait_for_unit("network-online.target")



    # Add a metric and check in Prometheus

    client.wait_until_succeeds(

      "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job"