Unverified Commit 206417b7 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 30ae8398 587ac4e8

doc/builders/testers.chapter.md

+20 −0
Original line number Diff line number Diff line
@@ -164,6 +164,26 @@ tests.fetchgit = testers.invalidateFetcherByDrvHash fetchgit { 
};

```



## `runNixOSTest` {#tester-runNixOSTest}



A helper function that behaves exactly like the NixOS `runTest`, except it also assigns this Nixpkgs package set as the `pkgs` of the test and makes the `nixpkgs.*` options read-only.



If your test is part of the Nixpkgs repository, or if you need a more general entrypoint, see ["Calling a test" in the NixOS manual](https://nixos.org/manual/nixos/stable/index.html#sec-calling-nixos-tests).



Example:



```nix

pkgs.testers.runNixOSTest ({ lib, ... }: {

  name = "hello";

  nodes.machine = { pkgs, ... }: {

    environment.systemPackages = [ pkgs.hello ];

  };

  testScript = ''

    machine.succeed("hello")

  '';

})

```



## `nixosTest` {#tester-nixosTest}



Run a NixOS VM network test using this evaluation of Nixpkgs.

doc/languages-frameworks/rust.section.md

+8 −5
Original line number Diff line number Diff line
@@ -535,7 +535,9 @@ directory of the `tokenizers` project's source archive, we use 
```nix

{ fetchFromGitHub

, buildPythonPackage

, cargo

, rustPlatform

, rustc

, setuptools-rust

}:
@@ -558,11 +560,12 @@ buildPythonPackage rec { 


  sourceRoot = "source/bindings/python";



  nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [

    cargoSetupHook

    rust.cargo

    rust.rustc

  ]);

  nativeBuildInputs = [

    cargo

    rustPlatform.cargoSetupHook

    rustc

    setuptools-rust

  ];



  # ...

}

maintainers/maintainer-list.nix

+3 −3
Original line number Diff line number Diff line
@@ -12656,9 +12656,9 @@ 
    githubId = 17690377;

  };

  ppom = {

    name = "Paco Pompeani";

    email = "paco@ecomail.io";

    github = "aopom";

    name = "ppom";

    email = "ppom@ecomail.fr";

    github = "ppom0";

    githubId = 38916722;

  };

  pradeepchhetri = {

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

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- [gemstash](https://github.com/rubygems/gemstash), a RubyGems.org cache and private gem server. Available as [services.gemstash](#opt-services.gemstash.enable).



- [gitea-actions-runner](https://gitea.com/gitea/act_runner), a CI runner for Gitea/Forgejo Actions. Available as [services.gitea-actions-runner](#opt-services.gitea-actions-runner.instances).



- [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer.  Available as [services.gmediarender](options.html#opt-services.gmediarender.enable).



- [harmonia](https://github.com/nix-community/harmonia/), Nix binary cache implemented in rust using libnix-store. Available as [services.harmonia](options.html#opt-services.harmonia.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ 
  ./services/continuous-integration/buildbot/master.nix

  ./services/continuous-integration/buildbot/worker.nix

  ./services/continuous-integration/buildkite-agents.nix

  ./services/continuous-integration/gitea-actions-runner.nix

  ./services/continuous-integration/github-runner.nix

  ./services/continuous-integration/github-runners.nix

  ./services/continuous-integration/gitlab-runner.nix