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

Merge master into staging-next

parents e22452a4 e18d8ec6

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ 


- [ringboard](https://github.com/SUPERCILEX/clipboard-history), a fast, efficient, and composable clipboard manager for Linux. Available for x11 as [services.ringboard](#opt-services.ringboard.x11.enable) and for wayland as [services.ringboard](#opt-services.ringboard.wayland.enable).



- [Tenstorrent](https://tenstorrent.com) hardware module has been added.



## Backward Incompatibilities {#sec-release-25.11-incompatibilities}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/hardware/tenstorrent.nix

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{

  config,

  pkgs,

  lib,

  ...

}:

let

  inherit (lib) mkEnableOption mkIf;

  inherit (config.boot.kernelPackages) tt-kmd;



  cfg = config.hardware.tenstorrent;

in

{

  options.hardware.tenstorrent.enable = mkEnableOption "Tenstorrent driver & utilities";



  config = mkIf cfg.enable {

    boot = {

      extraModulePackages = [ tt-kmd ];

      kernelModules = [ "tenstorrent" ];

    };



    services.udev.packages = [

      tt-kmd

    ];



    # TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged

    # TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged

  };

}

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
  ./hardware/sheep-net.nix

  ./hardware/steam-hardware.nix

  ./hardware/system-76.nix

  ./hardware/tenstorrent.nix

  ./hardware/tuxedo-drivers.nix

  ./hardware/ubertooth.nix

  ./hardware/uinput.nix

nixos/tests/kimai.nix

+3 −0
Original line number Diff line number Diff line
@@ -17,5 +17,8 @@ 
    machine.wait_for_unit("nginx.service")

    machine.wait_for_open_port(80)

    machine.succeed("curl -v --location --fail http://localhost/")

    # Make sure bundled assets are served.

    # https://github.com/NixOS/nixpkgs/issues/442208

    machine.succeed("curl -v --location --fail http://localhost/bundles/tabler/tabler.css")

  '';

}

pkgs/applications/editors/android-studio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ let 
    sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";

  };

  latestVersion = {

    version = "2025.2.1.3"; # "Android Studio Otter | 2025.2.1 Canary 3"

    sha256Hash = "sha256-McgPREXfErJ6vcHPKlAC4EVf61QedMV6J643LM5N7Wg=";

    version = "2025.2.1.5"; # "Android Studio Otter | 2025.2.1 Canary 5"

    sha256Hash = "sha256-Slpp29OMpG4i/9ykYBF/KMwnBgOTSuqObZrfdcMfDbQ=";

  };

in

{