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

Merge master into staging-nixos

parents 074d5dc7 b44e340c

doc/languages-frameworks/javascript.section.md

+6 −17
Original line number Diff line number Diff line
@@ -483,40 +483,29 @@ In this example, `prePnpmInstall` will be run by both `pnpmConfigHook` and by th 


#### pnpm `fetcherVersion` {#javascript-pnpm-fetcherVersion}



This is the version of the output of `fetchPnpmDeps`, if you haven't set it already, you can use `1` with your current hash:

This is the version of the output of `fetchPnpmDeps`. New packages should use `3`:



```nix

{

  # ...

  pnpmDeps = fetchPnpmDeps {

    # ...

    fetcherVersion = 1;

    hash = "..."; # you can use your already set hash here

  };

}

```



After upgrading to a newer `fetcherVersion`, you need to regenerate the hash:



```nix

{

  # ...

  pnpmDeps = fetchPnpmDeps {

    # ...

    fetcherVersion = 2;

    fetcherVersion = 3;

    hash = "..."; # clear this hash and generate a new one

  };

}

```



When upgrading to a newer `fetcherVersion`, you need to regenerate the hash.



This variable ensures that we can make changes to the output of `fetchPnpmDeps` without breaking existing hashes.

Changes can include workarounds or bug fixes to existing PNPM issues.



##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}



- 1: Initial version, nothing special

- 1: Initial version, nothing special. **Deprecated: Scheduled for removal in the 26.11 release.**. New packages must not use this value.

- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)

- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)

- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950). **Recommended**



### Yarn {#javascript-yarn}

doc/release-notes/rl-2605.section.md

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


- `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.



- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal

  in the 26.11 release. A deprecation warning has been added. Packages still on

  `fetcherVersion = 1` should migrate to `fetcherVersion = 3` and regenerate

  their hashes. See the [pnpm `fetcherVersion`

  section](#javascript-pnpm-fetcherVersion) of the manual for details.



- `buildNpmPackage` now supports `npmDepsFetcherVersion` (and `fetchNpmDeps` now supports `fetcherVersion`). Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces.



- Added `dell-bios-fan-control` package and service.

nixos/lib/systemd-network-units.nix

+4 −0
Original line number Diff line number Diff line
@@ -413,6 +413,10 @@ in 
      [QuickFairQueueingClass]

      ${attrsToSection def.quickFairQueueingConfigClass}

    ''

    + optionalString (def.mobileNetworkConfig != { }) ''

      [MobileNetwork]

      ${attrsToSection def.mobileNetworkConfig}

    ''

    + flip concatMapStrings def.bridgeVLANs (x: ''

      [BridgeVLAN]

      ${attrsToSection x}

nixos/modules/config/fonts/fontconfig.nix

+1 −2
Original line number Diff line number Diff line
@@ -518,8 +518,7 @@ in 


        useEmbeddedBitmaps = lib.mkOption {

          type = lib.types.bool;

          default = lib.versionAtLeast config.system.stateVersion "26.05";

          defaultText = lib.literalExpression "lib.versionAtLeast config.system.stateVersion \"26.05\"";

          default = true;

          description = "Use embedded bitmaps in fonts like Calibri.";

        };

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ 
  ./services/home-automation/esphome.nix

  ./services/home-automation/evcc.nix

  ./services/home-automation/govee2mqtt.nix

  ./services/home-automation/home-assistant-matter-hub.nix

  ./services/home-automation/home-assistant.nix

  ./services/home-automation/homebridge.nix

  ./services/home-automation/matter-server.nix
@@ -1212,7 +1213,6 @@ 
  ./services/networking/geph.nix

  ./services/networking/ghostunnel.nix

  ./services/networking/git-daemon.nix

  ./services/networking/globalprotect-vpn.nix

  ./services/networking/gns3-server.nix

  ./services/networking/gnunet.nix

  ./services/networking/go-autoconfig.nix