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

Merge master into staging-next

parents 0af6d76c 1d8fe405

nixos/modules/services/misc/ollama.nix

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ in 
            "char-nvidia-uvm"

            # ROCm

            "char-drm"

            "char-fb"

            "char-kfd"

            # WSL (Windows Subsystem for Linux)

            "/dev/dxg"

nixos/modules/system/boot/tmp.nix

+18 −0
Original line number Diff line number Diff line
@@ -31,6 +31,23 @@ in 
        '';

      };



      tmpfsHugeMemoryPages = lib.mkOption {

        type = lib.types.enum [

          "never"

          "always"

          "within_size"

          "advise"

        ];

        default = "never";

        example = "within_size";

        description = ''

          never        - Do not allocate huge memory pages. This is the default.

          always       - Attempt to allocate huge memory page every time a new page is needed.

          within_size  - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.

          advise       - Only allocate huge memory pages if requested with madvise(2).

        '';

      };



      useTmpfs = lib.mkOption {

        type = lib.types.bool;

        default = false;
@@ -60,6 +77,7 @@ in 
          "nosuid"

          "nodev"

          "size=${toString cfg.tmpfsSize}"

          "huge=${cfg.tmpfsHugeMemoryPages}"

        ];

      }

    ];

pkgs/applications/misc/clight/clightd.nix

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
  libusb1,

  libjpeg,

  libmodule,

  pcre,

  libXdmcp,

  util-linux,

  libpthreadstubs,
@@ -23,6 +22,7 @@ 
  enableGamma ? true,

  libdrm,

  libXrandr,

  libiio,

  wayland,

  enableScreen ? true,

  enableYoctolight ? true,
@@ -30,13 +30,13 @@ 


stdenv.mkDerivation rec {

  pname = "clightd";

  version = "5.8";

  version = "5.9";



  src = fetchFromGitHub {

    owner = "FedeDP";

    repo = "Clightd";

    rev = version;

    hash = "sha256-Lmno/TJVCQVNzfpKNZzuDf2OM6w6rbz+zJTr3zVo/CM=";

    hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo=";

  };



  # dbus-1.pc has datadir=/etc
@@ -81,8 +81,8 @@ stdenv.mkDerivation rec { 
      libusb1

      libjpeg

      libmodule

      libiio



      pcre

      libXdmcp

      util-linux

      libpthreadstubs

pkgs/applications/misc/zettlr/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {

  zettlr = {

    version = "3.4.3";

    hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c=";

    version = "3.4.4";

    hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ=";

  };

}

pkgs/applications/video/mpv/scripts/eisa01.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ let 
    let

      self = {

        inherit pname;

        version = "0-unstable-2023-11-25";

        version = "0-unstable-2025-05-08";



        src = fetchFromGitHub {

          owner = "Eisa01";

          repo = "mpv-scripts";

          rev = "48d68283cea47ff8e904decc9003b3abc3e2123e";

          hash = "sha256-edJfotlC5T8asqPIygR67BEWjP4i54Wx54StLfjpc48=";

          rev = "4701419f9b9063a5425f3942ec62cc029599430d";

          hash = "sha256-QXpuqViVXIGCDbX0OVjDW7E67odZTMbk1iXfz7bBasU=";

          # avoid downloading screenshots and videos

          sparseCheckout = [

            "scripts/"