Unverified Commit 8fd95f71 authored by Michael Daniels's avatar Michael Daniels
Browse files

Merge branch 'staging-next' into staging

parents 9158c593 464b9d0b

nixos/modules/services/misc/llama-cpp.nix

+40 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ 


let

  cfg = config.services.llama-cpp;



  modelsPresetFile =

    if cfg.modelsPreset != null then

      pkgs.writeText "llama-models.ini" (lib.generators.toINI { } cfg.modelsPreset)

    else

      null;

in

{
@@ -32,6 +38,32 @@ in 
        default = null;

      };



      modelsPreset = lib.mkOption {

        type = lib.types.nullOr (lib.types.attrsOf lib.types.attrs);

        default = null;

        description = ''

          Models preset configuration as a Nix attribute set.

          This is converted to an INI file and passed to llama-server via --model-preset.

          See llama-server documentation for available options.

        '';

        example = lib.literalExpression ''

          {

            "Qwen3-Coder-Next" = {

              hf-repo = "unsloth/Qwen3-Coder-Next-GGUF";

              hf-file = "Qwen3-Coder-Next-UD-Q4_K_XL.gguf";

              alias = "unsloth/Qwen3-Coder-Next";

              fit = "on";

              seed = "3407";

              temp = "1.0";

              top-p = "0.95";

              min-p = "0.01";

              top-k = "40";

              jinja = "on";

            };

          }

        '';

      };



      extraFlags = lib.mkOption {

        type = lib.types.listOf lib.types.str;

        description = "Extra flags passed to llama-cpp-server.";
@@ -77,6 +109,10 @@ in 
      serviceConfig = {

        Type = "idle";

        KillSignal = "SIGINT";

        StateDirectory = "llama-cpp";

        CacheDirectory = "llama-cpp";

        WorkingDirectory = "/var/lib/llama-cpp";

        Environment = [ "LLAMA_CACHE=/var/cache/llama-cpp" ];

        ExecStart =

          let

            args = [
@@ -93,6 +129,10 @@ in 
              "--models-dir"

              cfg.modelsDir

            ]

            ++ lib.optionals (cfg.modelsPreset != null) [

              "--models-preset"

              modelsPresetFile

            ]

            ++ cfg.extraFlags;

          in

          "${cfg.package}/bin/llama-server ${utils.escapeSystemdExecArgs args}";

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

+12 −1
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ in 
      example = "/run/netbox/netbox.sock";

    };



    gunicornArgs = lib.mkOption {

      type = lib.types.listOf lib.types.str;

      default = [ ];

      description = "extra args for gunicorn when serving netbox";

      example = [

        "--workers"

        "9"

      ];

    };



    package = lib.mkOption {

      type = lib.types.package;

      default =
@@ -362,7 +372,8 @@ in 
                  else

                    "${cfg.listenAddress}:${toString cfg.port}"

                } \

                --pythonpath ${pkg}/opt/netbox/netbox

                --pythonpath ${pkg}/opt/netbox/netbox \

                ${lib.concatStringsSep " " cfg.gunicornArgs}

            '';

            PrivateTmp = true;

            TimeoutStartSec = lib.mkDefault "5min";

nixos/modules/system/boot/clevis.nix

+6 −1
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ in 
        copy_bin_and_libs ${pkgs.jose}/bin/jose

        copy_bin_and_libs ${pkgs.curl}/bin/curl

        copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash

        copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup

        copy_bin_and_libs ${pkgs.gnused}/bin/gnused

        copy_bin_and_libs ${pkgs.gnugrep}/bin/gnugrep



        copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped

        mv $out/bin/{.tpm2-wrapped,tpm2}
@@ -103,13 +106,15 @@ in 
      systemd = {

        extraBin = lib.mkIf systemd.enable {

          clevis = "${cfg.package}/bin/clevis";

          curl = "${pkgs.curl}/bin/curl";

        };



        storePaths = lib.mkIf systemd.enable [

          cfg.package

          "${pkgs.jose}/bin/jose"

          "${pkgs.curl}/bin/curl"

          "${pkgs.cryptsetup}/bin/cryptsetup"

          "${pkgs.gnused}/bin/sed"

          "${pkgs.gnugrep}/bin/grep"

          "${pkgs.tpm2-tools}/bin/tpm2_createprimary"

          "${pkgs.tpm2-tools}/bin/tpm2_flushcontext"

          "${pkgs.tpm2-tools}/bin/tpm2_load"

pkgs/applications/editors/okteta/default.nix

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


stdenv.mkDerivation rec {

  pname = "okteta";

  version = "0.26.24";

  version = "0.26.25";



  src = fetchurl {

    url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";

    sha256 = "sha256-MbIyPwL01PyHLD/BNdVLuQklglaB5ZHdJfSmgMDSZWo=";

    sha256 = "sha256-K+GJG/SYyzgDDKXbGtAixQJVfBwLj/asP9rIJUpbt2s=";

  };



  nativeBuildInputs = [

pkgs/applications/emulators/libretro/cores/pcsx2.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
}:

mkLibretroCore {

  core = "pcsx2";

  version = "0-unstable-2025-09-29";

  version = "0-unstable-2026-02-06";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "ps2";

    rev = "9485a53fa5aa2bff17e04518116107f81a8c82e3";

    hash = "sha256-xkRPESbLNX9AFOIdEA9iW4Xn7hdJXfdi+TEbegC8KXA=";

    rev = "416291ad7dc3caf5df4501c9249cbbe30cbef811";

    hash = "sha256-rdrUsrezAfsbR7xd6ykIjB8cc4USUQcOMJV5mxbVn2o=";

    fetchSubmodules = true;

  };