Commit 66f01b7a authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents dcd94580 703fc88d
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@
    - changed-files:
      - any-glob-to-any-file:
        - doc/languages-frameworks/nim.section.md
        - pkgs/development/compilers/nim/*
        - pkgs/development/nim-packages/**/*
        - pkgs/top-level/nim-packages.nix
        - pkgs/build-support/build-nim-package.nix
        - pkgs/by-name/ni/nim*
        - pkgs/top-level/nim-overrides.nix

"6.topic: nodejs":
  - any:
+3 −1
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/by-name/ne/nemo-*        @mkg20001

# nim
/pkgs/development/compilers/nim   @ehmry
/doc/languages-frameworks/nim.section.md  @ehmry
/pkgs/build-support/build-nim-package.nix @ehmry
/pkgs/top-level/nim-overrides.nix         @ehmry

# terraform providers
/pkgs/applications/networking/cluster/terraform-providers @zowoq
+5 −5
Original line number Diff line number Diff line
@@ -71,20 +71,20 @@ nix-build -A nixosTests.hostname

### Testing outside the NixOS project {#sec-call-nixos-test-outside-nixos}

Outside the `nixpkgs` repository, you can instantiate the test by first importing the NixOS library,
Outside the `nixpkgs` repository, you can use the `runNixOSTest` function from
`pkgs.testers`:

```nix
let nixos-lib = import (nixpkgs + "/nixos/lib") { };
let pkgs = import <nixpkgs> {};
in

nixos-lib.runTest {
pkgs.testers.runNixOSTest {
  imports = [ ./test.nix ];
  hostPkgs = pkgs;  # the Nixpkgs package set used outside the VMs
  defaults.services.foo.package = mypkg;
}
```

`runTest` returns a derivation that runs the test.
`runNixOSTest` returns a derivation that runs the test.

## Configuring the nodes {#sec-nixos-test-nodes}

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

- The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped.

- Mattermost has been updated from 9.5 to 9.11 ESR. See the [changelog](https://docs.mattermost.com/about/mattermost-v9-changelog.html#release-v9-11-extended-support-release) for more details.

- `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside
  `rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig`

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ in
      enable = lib.mkEnableOption "the 1Password CLI tool";

      package = lib.mkPackageOption pkgs "1Password CLI" {
        default = [ "_1password" ];
        default = [ "_1password-cli" ];
      };
    };
  };
Loading