Merge master into staging-nixos

    githubId = 7831184;

    name = "John Mercier";

  };

  mochienya = {

    name = "mochienya";

    github = "mochienya";

    githubId = 187453775;

    matrix = "@mochienya:matrix.org";

    keys = [

      {

        fingerprint = "7A49 5110 84F4 EAF1 BE30  5CF0 CC3B E964 564F 9554";

      }

    ];

  };

  mockersf = {

    email = "francois.mockers@vleue.com";

    github = "mockersf";

If some values are instances of more than one of the types, it is not possible to distinguish which type they are meant to be instances of. If that's needed, consider using a [sum type](#sec-option-types-sums).

<!-- SYNC WITH oneOf BELOW -->

`types.either` *`t1 t2`*

:   Type *`t1`* or type *`t2`*, e.g. `with types; either int str`.

    Multiple definitions cannot be merged.

    ::: {.warning}

    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first type argument will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `either (attrsOf int) (submodule {...})` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.

    :::

<!-- SYNC WITH either ABOVE -->

`types.oneOf` \[ *`t1 t2`* ... \]

:   Type *`t1`* or type *`t2`* and so forth, e.g.

    `with types; oneOf [ int str bool ]`. Multiple definitions cannot be

    merged.

    ::: {.warning}

    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first matching type in the list will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `oneOf [ (attrsOf int) (submodule {...}) ]` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.

    :::

`types.nullOr` *`t`*

:   `null` or type *`t`*. Multiple definitions are merged according to

    type *`t`*.

    This is mostly equivalent to `either (enum [ null ]) t`, but `nullOr` provides a `null` fallback for attribute values with `mkIf false` definitions in `lazyAttrsOf (nullOr t)`, whereas `either` would throw an error when the attribute is accessed.

## Sum types {#sec-option-types-sums}

stdenv.mkDerivation (finalAttrs: {

  pname = "palemoon-bin";

  version = "33.9.0.1";

  version = "33.9.1";

  src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";

      {

        gtk3 = fetchzip {

          urls = urlRegionVariants "gtk3";

          hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg=";

          hash = "sha256-muFqS3NpYX0Walhd+RFIZh7pUKQ5ZbPMZJasm9+rqTE=";

        };

        gtk2 = fetchzip {

          urls = urlRegionVariants "gtk2";

          hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU=";

          hash = "sha256-lRFXpv+dp3ALVSiEDwE4kiaVjBX5XuVZeugEr+St53I=";

        };

      };

rustPlatform.buildRustPackage rec {

  pname = "alfis";

  version = "0.8.7";

  version = "0.8.8";

  src = fetchFromGitHub {

    owner = "Revertron";

    repo = "Alfis";

    tag = "v${version}";

    hash = "sha256-u5luVJRNIuGqqNyh+C7nMSkZgoq/S7gpmsEiz8ntmC4=";

    hash = "sha256-gRk4kvIV+5cCUFaJvGbTAR44678Twa28iMGZ75lJz2c=";

  };

  cargoHash = "sha256-ittJ/iKcmvd5r8oaBoGhi/E2osq245OWxSC+VH+bme4=";

  cargoHash = "sha256-Ge0+7ClXlJFT6CyluHF7k4stsX+KuYp/riro1pvrcKM=";

  nativeBuildInputs = [

    pkg-config

buildNpmPackage rec {

  pname = "basedpyright";

  version = "1.31.7";

  version = "1.32.1";

  src = fetchFromGitHub {

    owner = "detachhead";

    repo = "basedpyright";

    tag = "v${version}";

    hash = "sha256-mC+qnEI2a7tGjIIZxRzGY+VyfYnTY1brCKGHU3KOf0Q=";

    hash = "sha256-bxqUH5MYwp8MLD8ve8afgN3qe3hCPRu0l7QO7m1ZSzA=";

  };

  npmDepsHash = "sha256-dwtMl5dFpol+J+cM6EHiwO+F93Iyurwx9Kr317IGtVw=";

  npmDepsHash = "sha256-zNmZ4wXxe31NnQ+VlTLoPM2zTDmKdw1D28pi/roybdQ=";

  npmWorkspace = "packages/pyright";

  preBuild = ''