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

2026-06-05 21:03:40 +00:00 · 2026-05-10 21:22:57 +03:00
parent 2d9fdeb944 539206eac5
commit 41e3cd9cdb
175 changed files with 1226 additions and 305 deletions
--- a/doc/using/configuration.chapter.md
+++ b/doc/using/configuration.chapter.md
@@ -31,6 +31,22 @@ Unfree software is not tested or built in Nixpkgs continuous integration, and th
 Most unfree licenses prohibit either executing or distributing the software.
 :::

+The `NIXPKGS_CONFIG` environment variable can override the configuration file location.
+Nixpkgs resolves the config in this order:
+
+1.  `$NIXPKGS_CONFIG`, if set and the file exists.
+2.  `~/.config/nixpkgs/config.nix`, if it exists.
+3.  `~/.nixpkgs/config.nix` (legacy), if it exists.
+4.  Empty configuration.
+
+On NixOS, `NIXPKGS_CONFIG` points to `/etc/nix/nixpkgs-config.nix` system-wide.
+Drop a file there to apply configuration to `nix-env`, `nix-shell`, and other user-level commands.
+NixOS does not create this file.
+The [`nixpkgs.config`](https://nixos.org/manual/nixos/stable/options#opt-nixpkgs.config) option does not affect `nix-env`, `nix-shell`, or other user-level commands.
+
+This lookup applies to non-flake usage like channels and `<nixpkgs>`.
+Flakes ignore it; pass `config` directly when importing `nixpkgs`.
+
 ## Installing broken packages {#sec-allow-broken}

 There are several ways to try compiling a package which has been marked as broken.
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -589,7 +589,8 @@ let
    in
    modulesPath: initialModules: args: {
      modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
-      # Intentionally not shared with `modules` above: this allows `collected`
+      # Intentionally not shared with `modules` above: this allows
+      # the return value of `collectStructuredModules`
      # to be garbage collected after `filterModules` returns.
      graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args);
    };
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -337,7 +337,6 @@ rec {

  /**
    Concatenate a list of strings, adding a newline at the end of each one.
-    Defined as `concatMapStrings (s: s + "\n")`.

    # Inputs

@@ -361,7 +360,7 @@ rec {

    :::
  */
-  concatLines = concatMapStrings (s: s + "\n");
+  concatLines = lines: optionalString (lines != [ ]) (concatStringsSep "\n" lines + "\n");

  /**
    Given string `s`, replace every occurrence of the string `from` with the string `to`.
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -4950,10 +4950,13 @@ assertNoAdditions {
    };
  });

-  vim-flog = super.vim-flog.overrideAttrs {
+  vim-flog = super.vim-flog.overrideAttrs (old: {
    # Not intended to be required, used by vim plugin
    nvimSkipModules = "flog.graph_bin";
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });

  vim-fugitive = super.vim-fugitive.overrideAttrs (old: {
    meta = old.meta // {
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix
@@ -34,7 +34,7 @@ let
    };
    makeCacheWritable = true;

-    buildInputs = lib.optionals stdenv.isLinux [
+    buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
      libsecret
    ];
    nativeBuildInputs = [
@@ -42,10 +42,10 @@ let
      nodejs-slim.python
      npmHooks.npmConfigHook
    ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
      pkg-config
    ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      cctools.libtool
      clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar
    ];
--- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix
@@ -32,7 +32,7 @@ let
      hash = "sha256-vktxhQA2a+D9Nr4vhbmGCnNdGzt0U89K50g0SgiV5SE=";
    };

-    buildInputs = lib.optionals stdenv.isLinux [
+    buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
      libsecret
    ];

@@ -41,10 +41,10 @@ let
      nodejs-slim.python
      npmHooks.npmConfigHook
    ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
      pkg-config
    ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar
    ];

--- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
@@ -47,7 +47,7 @@ let
      pkg-config

    ]
-    ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar

    # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
    installPhase = ''
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix
@@ -22,7 +22,7 @@ buildNpmPackage {
    python3
    pkg-config
  ]
-  ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar

  buildInputs = [ libsecret ];

--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
  '';

  installPhase =
-    if stdenv.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
      ''
        mkdir -p "$out"
        mv diffpdf.app "$out"/
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -27,7 +27,7 @@
    passthru.tests = {
      test = tests.rust-hooks.cargoBuildHook;
    }
-    // lib.optionalAttrs (stdenv.isLinux) {
+    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
    };
  } ./cargo-build-hook.sh;
@@ -41,7 +41,7 @@
    passthru.tests = {
      test = tests.rust-hooks.cargoCheckHook;
    }
-    // lib.optionalAttrs (stdenv.isLinux) {
+    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
    };
  } ./cargo-check-hook.sh;
@@ -54,7 +54,7 @@
    passthru.tests = {
      test = tests.rust-hooks.cargoInstallHook;
    }
-    // lib.optionalAttrs (stdenv.isLinux) {
+    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
    };
  } ./cargo-install-hook.sh;
@@ -68,7 +68,7 @@
    passthru.tests = {
      test = tests.rust-hooks.cargoNextestHook;
    }
-    // lib.optionalAttrs (stdenv.isLinux) {
+    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
    };
  } ./cargo-nextest-hook.sh;
@@ -107,7 +107,7 @@
    passthru.tests = {
      test = tests.rust-hooks.cargoSetupHook;
    }
-    // lib.optionalAttrs (stdenv.isLinux) {
+    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
    };
  } ./cargo-setup-hook.sh;
--- a/pkgs/by-name/ab/abbaye-des-morts/package.nix
+++ b/pkgs/by-name/ab/abbaye-des-morts/package.nix
@@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: {
    "PREFIX=${placeholder "out"}"
    "DESTDIR="
  ]
-  ++ lib.optional stdenv.isDarwin "PLATFORM=mac";
+  ++ lib.optional stdenv.hostPlatform.isDarwin "PLATFORM=mac";

  # Even with PLATFORM=mac, the Makefile specifies some GCC-specific CFLAGS that
  # are not supported by modern Clang on macOS
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
    substituteInPlace Makefile \
      --replace-fail "-funswitch-loops" "" \
      --replace-fail "-fgcse-after-reload" ""
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@@ -60,10 +60,10 @@ stdenv.mkDerivation {
    makeWrapper
    patchelf
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    autoPatchelfHook
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    fixDarwinDylibNames
  ];

--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1777624460-g8bb2f0"
+        "@sourcegraph/amp": "^0.0.1778343260-gb9a37d"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1777624460-g8bb2f0",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1777624460-g8bb2f0.tgz",
-      "integrity": "sha512-LGr3VAfyW5W7eJNPa545KvCL11qsac0FFzu67rPrqCR2Xh7v0mP1N7S9TLHKDG74NoqmB3xdhX7o0lIk2ZoGkg==",
+      "version": "0.0.1778343260-gb9a37d",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1778343260-gb9a37d.tgz",
+      "integrity": "sha512-TY4lL2lqwt+NtBa3ngKZSYfY5Z1qBAOd4UQMCT0nsUKatQGtSOIMec+zQSv6tr0L+z2jrDUzD0cpRkBDkLQjsQ==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.10"
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1777624460-g8bb2f0";
+  version = "0.0.1778343260-gb9a37d";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-HUoRVq++AsIbQxJHkI4oyPyBbFcji6BvWdWxrqdUQQ0=";
+    hash = "sha256-48FyPDniLNQoeZ+SaheTvzLCYL3r95e9VDCW4Y5gMq8=";
  };

  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-Lnnutg8LDp9UMuJ+TuoRABK7lcQNizZDltr1cMFpYEc=";
+  npmDepsHash = "sha256-Ce7TaJuSrha+NcFmppMm/byAFosBR2I/zMY4KA5JXuE=";

  propagatedBuildInputs = [
    ripgrep
--- a/pkgs/by-name/an/angle/package.nix
+++ b/pkgs/by-name/an/angle/package.nix
@@ -35,7 +35,7 @@ let
      llvmPackages.clang
    ];
    postBuild =
-      if stdenv.isDarwin then
+      if stdenv.hostPlatform.isDarwin then
        ''
          mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/darwin
          ln -s $out/resource-root/lib/darwin/libclang_rt.osx.a \
@@ -67,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
    python3
    llvmPackages.bintools
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    xcbuild
  ];

  buildInputs =
-    lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.hostPlatform.isLinux [
      glib
      libxcb.dev
      libx11.dev
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
      pciutils
      libGL
    ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      apple-sdk_15
    ];

--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
  cmakeFlags = [
    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
    (lib.cmakeBool "BUILD_JAVA" false)
-    (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.isLinux)
+    (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.hostPlatform.isLinux)
    (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
  ]
  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
  # skip tests on darwin due to some local networking failures
  # `__darwinAllowLocalNetworking = true;` wasn't sufficient for
  # aarch64 or x86_64
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
  preCheck = ''
    # some test data include SOURCE_DATE_EPOCH (which is different from our default)
    # and the default version info which we get by unsetting our ldflags
--- a/pkgs/by-name/at/atuin-desktop/package.nix
+++ b/pkgs/by-name/at/atuin-desktop/package.nix
@@ -153,7 +153,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=ui::viewport::tests::test_add_line_scrolling"
    "--skip=ui::viewport::tests::test_line_wrapping"
  ];
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;

  __structuredAttrs = true;

--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
    (cmakeBool "ENABLE_SSE42" enableSSE42)
  ];

-  installPhase = optionalString stdenv.isDarwin ''
+  installPhase = optionalString stdenv.hostPlatform.isDarwin ''
    runHook preInstall

    mkdir -p $out/Applications $out/bin
@@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
    qtWrapperArgs+=(
      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
-      ${optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : ${
+      ${optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : ${
        lib.makeLibraryPath [ moltenvk ]
      }"}
    )
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -40,7 +40,7 @@ buildNpmPackage rec {
    docify
    pkg-config
  ]
-  ++ lib.optional stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar
+  ++ lib.optional stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar

  buildInputs = [ libsecret ];

--- a/pkgs/by-name/bl/bluej/package.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -19,7 +19,7 @@ let
    {
      enableJavaFX = true;
    }
-    // lib.optionalAttrs stdenv.isLinux {
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
      openjfx_jdk = openjfx21.override { withWebKit = true; };
    }
  );
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -62,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
      "varmod-localtime"
    ]
    # TODO: drop the name-conditioning on stdenv rebuild
-    ++ lib.optional (stdenv.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin") "export"
+    ++ lib.optional (
+      stdenv.hostPlatform.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin"
+    ) "export"
  );

  strictDeps = true;
--- a/pkgs/by-name/br/brainflow/package.nix
+++ b/pkgs/by-name/br/brainflow/package.nix
@@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "brainflow";
-  version = "5.21.0";
+  version = "5.22.0";

  src = fetchFromGitHub {
    owner = "brainflow-dev";
    repo = "brainflow";
    tag = finalAttrs.version;
-    hash = "sha256-AE8c2ArkNipoAJSCj3NHEM91rulfbWGyANunPESKc/E=";
+    hash = "sha256-DizB9SCw3SMOsBz/bioUqLvDME9lfNaBzOY/pFGzv8g=";
  };

  patches = [ ];
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.89.145";
+  version = "1.90.121";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-WcLCmhbALtVHL4LEPCUyLfRZR30kdc/41pfHxvE0rJQ=";
+      hash = "sha256-y4wAvJdghCfKF61EQoZHaZ28qmX2/DTmBhISRj+m8EM=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-t7OXN+42gXd/b9fE8sd40aH2l/nW2OvtLvHCqb7/1qI=";
+      hash = "sha256-XOTxy6+P6abDZtE9UlxSVX/eEDfNFrudC/q+9+gE3s4=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-A5SGxb+r0wEbdo7ZkUrwm6zVr86+vpOvtfBpZivmNoE=";
+      hash = "sha256-WI5QIym3rMC8z+CcsLG+K4qgEaRiNzIOO7a7Vf45r1M=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-kTk6BeKuGkteKlGBk2b5ftDeo9F+EaWwk4DoEzlfJGw=";
+      hash = "sha256-a3GJeQ6InfTz3a4jtdOcNfP37MqLsjnuIJo3M451NKc=";
    };
  };

--- a/pkgs/by-name/br/brogue-ce/package.nix
+++ b/pkgs/by-name/br/brogue-ce/package.nix
@@ -46,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
    "DATADIR=$(out)/opt/brogue-ce"
    "TERMINAL=${if terminal then "YES" else "NO"}"
    "GRAPHICS=${if graphics then "YES" else "NO"}"
-    "MAC_APP=${if stdenv.isDarwin then "YES" else "NO"}"
+    "MAC_APP=${if stdenv.hostPlatform.isDarwin then "YES" else "NO"}"
  ];

-  postBuild = lib.optionalString (stdenv.isDarwin && graphics) ''
+  postBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) ''
    make Brogue.app $makeFlags
  '';

@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

-  postInstall = lib.optionalString (stdenv.isDarwin && graphics) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) ''
    mkdir -p $out/Applications
    mv Brogue.app "$out/Applications/Brogue CE.app"
  '';
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage {
  nativeBuildInputs = [
    pkg-config
  ]
-  ++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds
+  ++ lib.optional stdenv.hostPlatform.isDarwin clang_20; # clang_21 breaks gyp builds

  buildInputs = [
    pango
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -42,7 +42,7 @@ buildNpmPackage rec {
  nativeBuildInputs = [
    pkg-config
  ]
-  ++ lib.optional stdenv.isDarwin clang_20 # clang_21 breaks gyp builds
+  ++ lib.optional stdenv.hostPlatform.isDarwin clang_20 # clang_21 breaks gyp builds
  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
    makeWrapper
    copyDesktopItems
--- a/pkgs/by-name/br/brush-splat/package.nix
+++ b/pkgs/by-name/br/brush-splat/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    vulkan-loader
    zstd
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    wayland
  ];

--- a/pkgs/by-name/ca/caido-cli/package.nix
+++ b/pkgs/by-name/ca/caido-cli/package.nix
@@ -35,9 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
  );

  nativeBuildInputs =
-    lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ];
+    lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];

-  buildInputs = lib.optionals stdenv.isLinux [ libgcc ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgcc ];

  sourceRoot = ".";

--- a/pkgs/by-name/ca/caido-desktop/package.nix
+++ b/pkgs/by-name/ca/caido-desktop/package.nix
@@ -113,9 +113,9 @@ let
  };

 in
-if stdenv.isLinux then
+if stdenv.hostPlatform.isLinux then
  linux
-else if stdenv.isDarwin then
+else if stdenv.hostPlatform.isDarwin then
  darwin
 else
  throw "caido-desktop: unsupported platform ${stdenv.hostPlatform.system}"
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  };

  # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
-  patches = lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [
    ./no-dtrace-macos.patch
  ];

--- a/pkgs/by-name/cg/cgui/fix-gcc15.patch
+++ b/pkgs/by-name/cg/cgui/fix-gcc15.patch
@@ -0,0 +1,15 @@
+diff --git a/examples/25viewer.c b/examples/25viewer.c
+index 37e4585..a0328f0 100644
+--- a/examples/25viewer.c
+++ b/examples/25viewer.c
+@@ -10,8 +10,9 @@
+ 
+ static const char *fname; /* stores name of file to open */
+ 
+-void quit()
+void quit(void *data)
+ {
+   (void)data;
+    exit(0);
+ }
+ 
--- a/pkgs/by-name/cg/cgui/package.nix
+++ b/pkgs/by-name/cg/cgui/package.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
    sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
  };

+  patches = [
+    ./fix-gcc15.patch
+  ];
+
  buildInputs = [
    texinfo
    allegro
--- a/pkgs/by-name/cl/cli53/package.nix
+++ b/pkgs/by-name/cl/cli53/package.nix
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "cli53";
-  version = "0.8.22";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "barnybug";
    repo = "cli53";
-    rev = finalAttrs.version;
-    sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-ojLqveOZ8IIJXNd6PdXbqWYcwXqAjjEpKiquqXwcZt8=";
  };

-  vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s=";
+  vendorHash = "sha256-OpBeuIyyFOliVtN1z9Ll9ji2qNS41NvZBjL7vJvRe6E=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/cr/creduce/fix-gcc15.patch
+++ b/pkgs/by-name/cr/creduce/fix-gcc15.patch
@@ -0,0 +1,53 @@
+From 1c715fef9113d5a5291694eab739d4a743ab08d5 Mon Sep 17 00:00:00 2001
+From: Bradley Walters <oss@walters.app>
+Date: Fri, 2 Jan 2026 22:02:30 -0800
+Subject: [PATCH] unifdef: constexpr is reserved in C23
+
+---
+ unifdef/unifdef.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/unifdef/unifdef.c b/unifdef/unifdef.c
+index 5c67cd44..692a1640 100644
+--- a/unifdef/unifdef.c
+++ b/unifdef/unifdef.c
+@@ -201,7 +201,7 @@ static int              depth;			/* current #if nesting */
+ static int              delcount;		/* count of deleted lines */
+ static unsigned         blankcount;		/* count of blank lines */
+ static unsigned         blankmax;		/* maximum recent blankcount */
+-static bool             constexpr;		/* constant #if expression */
+static bool             isconstexpr;		/* constant #if expression */
+ static bool             zerosyms;		/* to format symdepth output */
+ static bool             firstsym;		/* ditto */
+ 
+@@ -1078,7 +1078,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			*valp = (value[sym] != NULL);
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 		}
+-		constexpr = false;
+		isconstexpr = false;
+ 	} else if (!endsym(*cp)) {
+ 		debug("eval%d symbol", prec(ops));
+ 		sym = findsym(&cp);
+@@ -1095,7 +1095,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 			cp = skipargs(cp);
+ 		}
+-		constexpr = false;
+		isconstexpr = false;
+ 	} else {
+ 		debug("eval%d bad expr", prec(ops));
+ 		return (LT_ERROR);
+@@ -1162,10 +1162,10 @@ ifeval(const char **cpp)
+ 	long val = 0;
+ 
+ 	debug("eval %s", *cpp);
+-	constexpr = killconsts ? false : true;
+	isconstexpr = killconsts ? false : true;
+ 	ret = eval_table(eval_ops, &val, cpp);
+ 	debug("eval = %d", val);
+-	return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+	return (isconstexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+ }
+ 
+ /*
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -4,13 +4,15 @@
  fetchFromGitHub,
  cmake,
  makeWrapper,
-  llvm,
-  libclang,
+  llvmPackages_18,
  flex,
  zlib,
  perlPackages,
  util-linux,
 }:
+let
+  llvmPackages = llvmPackages_18;
+in

 stdenv.mkDerivation {
  pname = "creduce";
@@ -23,6 +25,11 @@ stdenv.mkDerivation {
    hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA=";
  };

+  patches = [
+    # https://github.com/csmith-project/creduce/pull/290
+    ./fix-gcc15.patch
+  ];
+
  postPatch = ''
    substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \
    "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
@@ -39,14 +46,14 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    cmake
    makeWrapper
-    llvm.dev
+    llvmPackages.llvm.dev
  ];
  buildInputs = [
    # Ensure stdenv's CC is on PATH before clang-unwrapped
    stdenv.cc
    # Actual deps:
-    llvm
-    libclang
+    llvmPackages.llvm
+    llvmPackages.libclang
    flex
    zlib
  ]
--- a/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch
+++ b/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch
@@ -0,0 +1,11 @@
+diff --git a/src/include/external/cxxopts.hpp b/src/include/external/cxxopts.hpp
+--- a/src/include/external/cxxopts.hpp
+++ b/src/include/external/cxxopts.hpp
+@@ -26,6 +26,7 @@ THE SOFTWARE.
+ #define CXXOPTS_HPP_INCLUDED
+
+ #include <cctype>
+#include <cstdint>
+ #include <cstring>
+ #include <exception>
+ #include <iostream>
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -36,6 +36,8 @@ clangStdenv.mkDerivation rec {
      url = "https://github.com/d-SEAMS/seams-core/commit/f6156057e43d0aa1a0df9de67d8859da9c30302d.patch";
      hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw=";
    })
+    # Add missing <cstdint> include for uint8_t in vendored cxxopts.
+    ./cxxopts-cstdint.patch
  ];
  postPatch = ''
    substituteInPlace CMakeLists.txt \
--- a/pkgs/by-name/da/dashy-ui/package.nix
+++ b/pkgs/by-name/da/dashy-ui/package.nix
@@ -17,16 +17,16 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "dashy-ui";
-  version = "4.0.5";
+  version = "4.0.7";
  src = fetchFromGitHub {
    owner = "lissy93";
    repo = "dashy";
    tag = finalAttrs.version;
-    hash = "sha256-vcNKnRcSQMU4AuvWTFdTlxVOAA0rlPCKUrDZbd+8/mk=";
+    hash = "sha256-PWuynBFOp4A/0AC5Lc5zAkb5Y5DWJgdZHtDc/douYQc=";
  };
  yarnOfflineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-1FRrhNKm38/AP30F6Rf0cCHflIK9bWoxUCMMiT5c1Fc=";
+    hash = "sha256-jU/XnX6i6P1CWWWyUeVXt2q2PXMExDvmPTiLBOEuHcE=";
  };

  passthru = {
--- a/pkgs/by-name/di/dictu/package.nix
+++ b/pkgs/by-name/di/dictu/package.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
        -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/'
  '';

+  # bcrypt magic value triggers gcc 15 -Wunterminated-string-initialization.
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=unterminated-string-initialization";
+
  cmakeFlags = [
    "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}"
    "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}"
--- a/pkgs/by-name/do/dovecot/generic.nix
+++ b/pkgs/by-name/do/dovecot/generic.nix
@@ -147,9 +147,11 @@ stdenv.mkDerivation (finalAttrs: {
      'NOPLUGIN_LDFLAGS="-undefined dynamic_lookup"'
  '';

-  preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
-  '';
+  preBuild =
+    lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.hostPlatform.isDarwin)
+      ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
+      '';

  # We need this for sysconfdir, see remark below.
  installFlags = [ "DESTDIR=$(out)" ];
--- a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optional withLDAP "--with-ldap";

-  preBuild = lib.optionalString (!isCurrent && stdenv.isDarwin) ''
+  preBuild = lib.optionalString (!isCurrent && stdenv.hostPlatform.isDarwin) ''
    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
  '';

--- a/pkgs/by-name/er/eresi/package.nix
+++ b/pkgs/by-name/er/eresi/package.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

+  # K&R-style function-pointer declarations break under gcc 15's C23 default.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  postPatch = ''
    # Two occurences of fprintf() with only two arguments, which should really
    # be fputs().
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -12,13 +12,13 @@

 buildGoModule (finalAttrs: {
  pname = "fastly";
-  version = "14.3.1";
+  version = "15.0.0";

  src = fetchFromGitHub {
    owner = "fastly";
    repo = "cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8RdJNGI8FzM2HVkJNbWqr2Cw+CkPUTZ7uiiLQVEKTGM=";
+    hash = "sha256-ZSUT0f3U6tmJLtSdpTorAYxJExdR+zVan+Gua3BIcDM=";
    # The git commit is part of the `fastly version` original output;
    # leave that output the same in nixpkgs. Use the `.git` directory
    # to retrieve the commit SHA, and remove the directory afterwards,
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
    "cmd/fastly"
  ];

-  vendorHash = "sha256-XzfsPSG0gEXhlAF9O3VGNn8FGXlvXFxqX7kffQDdsRA=";
+  vendorHash = "sha256-J0UvU/rXUpxJEn/p+ScO8omFwHY2JD3kq7zGes0ohQ8=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optionals enableNFD [
    nativefiledialog-extended
  ]
-  ++ lib.optionals (enableNFD && stdenv.isLinux) [
+  ++ lib.optionals (enableNFD && stdenv.hostPlatform.isLinux) [
    gtk3
  ]
  ++ lib.optionals enablePython [
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = enableTests;

-  nativeCheckInputs = lib.optionals (enableTests && stdenv.isLinux) [
+  nativeCheckInputs = lib.optionals (enableTests && stdenv.hostPlatform.isLinux) [
    xvfb-run
  ];

@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
    runHook preCheck

    cd feather-tk/src/feather-tk-build
-    ${if stdenv.isLinux then "xvfb-run" else ""} ctest --verbose -C Release
+    ${if stdenv.hostPlatform.isLinux then "xvfb-run" else ""} ctest --verbose -C Release

    runHook postCheck
  '';
--- a/pkgs/by-name/fi/filen-desktop/package.nix
+++ b/pkgs/by-name/fi/filen-desktop/package.nix
@@ -63,7 +63,7 @@ buildNpmPackage {
    electron
    makeWrapper
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    desktopToDarwinBundle
  ];

--- a/pkgs/by-name/fi/filtr/package.nix
+++ b/pkgs/by-name/fi/filtr/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -45,7 +45,7 @@ let
    # Timeouts
    "TestRunJob_WithConnectionFromCommandOptions"
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # Uses docker-specific options, unsupported on Darwin
    "TestMergeJobOptions"
  ];
--- a/pkgs/by-name/fv/fverb/package.nix
+++ b/pkgs/by-name/fv/fverb/package.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation {
    platforms = lib.platforms.unix;
    # clang++: error: unsupported option '-mfpu=' for target 'arm64-apple-darwin'
    # clang++: error: unsupported option '-mfloat-abi=' for target 'arm64-apple-darwin'
-    broken = stdenv.isDarwin && stdenv.isAarch64;
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
  };
 }
--- a/pkgs/by-name/ga/gate12/package.nix
+++ b/pkgs/by-name/ga/gate12/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -28,14 +28,14 @@ buildNpmPackage (finalAttrs: {

  npmDepsHash = "sha256-4znN1YR3AX2SKeCJjUS8cm6WGcOGPXI27xrQCotBjgQ=";

-  dontPatchElf = stdenv.isDarwin;
+  dontPatchElf = stdenv.hostPlatform.isDarwin;

  nativeBuildInputs = [
    jq
    pkg-config
    makeWrapper
  ]
-  ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar

  buildInputs = [
    ripgrep
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gforth";
-  version = "0.7.9_20260415";
+  version = "0.7.9_20260508";

  src = fetchFromGitHub {
    owner = "forthy42";
    repo = "gforth";
    rev = finalAttrs.version;
-    hash = "sha256-eMBerL8kry9UlsXS4qdXT7jLK4f1S/q//5qkJ5qi3dA=";
+    hash = "sha256-XcGykMUEMmrNQ8y++SM1s0RPfMFgBTDXAIeAGKgU2Iw=";
  };

  patches = [ ./use-nproc-instead-of-fhs.patch ];
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
  # required to support pthread_cancel()
  NIX_LDFLAGS =
    lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
-    + lib.optionalString stdenv.isFreeBSD "-lthr";
+    + lib.optionalString stdenv.hostPlatform.isFreeBSD "-lthr";

  # The build phase already installs it all
  GIT_PREFIX = placeholder "out";
--- a/pkgs/by-name/gn/gnumake/package.nix
+++ b/pkgs/by-name/gn/gnumake/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
  ]
  ++ lib.optionals (!inBootstrap) [ texinfo ]
-  ++ lib.optional stdenv.isCygwin gettext;
+  ++ lib.optional stdenv.hostPlatform.isCygwin gettext;

  buildInputs = lib.optionals guileEnabled [ guile ];

--- a/pkgs/by-name/go/goverlay/package.nix
+++ b/pkgs/by-name/go/goverlay/package.nix
@@ -24,13 +24,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "goverlay";
-  version = "1.7.5";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "benjamimgois";
    repo = "goverlay";
    tag = finalAttrs.version;
-    hash = "sha256-q4g6K4iUkeam1dVHOWdkUjH/XAOIKgOXnJDE0dm5HVw=";
+    hash = "sha256-/ItkUqUQq1aeDPB8gHNOQkFp8s+/mOwFthnC77fT+h8=";
  };

  outputs = [
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -106,7 +106,7 @@ buildGoModule (finalAttrs: {
        "Test_dpkgUseCPEsForEOLEnvVar"
        "Test_rpmUseCPEsForEOLEnvVar"
      ]
-      ++ lib.optionals stdenv.isDarwin [
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
        # fails to generate x509 certificate
        # cat: /etc/ssl/openssl.cnf: Operation not permitted
        "Test_defaultHTTPClientHasCert"
--- a/pkgs/by-name/hy/hygg/package.nix
+++ b/pkgs/by-name/hy/hygg/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ## Skipping this test due to the high variability of its outcome
  ## When the package was merged the test was passing but on hydra its not
  ## Look at PR #448907
-  ++ (if pkgs.stdenv.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]);
+  ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]);

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
--- a/pkgs/by-name/id/idris2/libidris2_support.nix
+++ b/pkgs/by-name/id/idris2/libidris2_support.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
  makeFlags = [
    "PREFIX=${placeholder "out"}"
  ]
-  ++ lib.optional stdenv.isDarwin "OS=";
+  ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";

  buildFlags = [ "support" ];

--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
    # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
    ./inetutils-1_9-PATH_PROCNET_DEV.patch

-    (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch)
+    (if stdenv.hostPlatform.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch)

    (fetchpatch {
      name = "CVE-2026-24061_1.patch";
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers";

-  ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ];
+  ${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "format" ];

  doCheck = true;

--- a/pkgs/by-name/is/isle-portable/unwrapped.nix
+++ b/pkgs/by-name/is/isle-portable/unwrapped.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    fetchSubmodules = true;
  };

-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
    substituteInPlace packaging/macos/CMakeLists.txt \
      --replace-fail "fixup_bundle" "#fixup_bundle"
  '';
--- a/pkgs/by-name/ja/jabref/package.nix
+++ b/pkgs/by-name/ja/jabref/package.nix
@@ -173,8 +173,8 @@ stdenv.mkDerivation rec {
    zip -d $out/lib/javafx-web-*-*.jar "*.so"

    # Use postgresql from nixpkgs since the bundled binary doesn't work on NixOS
-    ARCH1=${if stdenv.isAarch64 then "arm64v8" else "amd64"}
-    ARCH2=${if stdenv.isAarch64 then "arm_64" else "x86_64"}
+    ARCH1=${if stdenv.hostPlatform.isAarch64 then "arm64v8" else "amd64"}
+    ARCH2=${if stdenv.hostPlatform.isAarch64 then "arm_64" else "x86_64"}
    mkdir postgresql
    cd postgresql
    ln -s ${postgresql}/{lib,share} ./
--- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
@@ -75,7 +75,7 @@ python3Packages.buildPythonPackage {
    echo -e 'quit()' | env -i ./kresd -a 127.0.0.1#53535 -c test-http.lua
  '';

-  doCheck = python3Packages.stdenv.isLinux; # maybe in future
+  doCheck = python3Packages.stdenv.hostPlatform.isLinux; # maybe in future
  nativeCheckInputs = with python3Packages; [
    augeas
    dnspython
--- a/pkgs/by-name/kt/kty/package.nix
+++ b/pkgs/by-name/kt/kty/package.nix
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  pkg-config,
  openssl,
+  oniguruma,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,10 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {

  env = {
    OPENSSL_NO_VENDOR = 1;
+    RUSTONIG_SYSTEM_LIBONIG = 1;
  };

  buildInputs = [
    openssl
+    oniguruma
  ];

  cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko=";
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -36,7 +36,7 @@ let

  pname = "librewolf-bin-unwrapped";

-  version = "150.0.1-1";
+  version = "150.0.2-1";
 in

 stdenv.mkDerivation {
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
    url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
    hash =
      {
-        x86_64-linux = "sha256-yIZGbTTelMerlFZ2oISCHtK/C62KjGnWd6agO4H+pbo=";
-        aarch64-linux = "sha256-hEAH1/I40f/fjUtODJc6kMuUhr4Xj+TyEvn0TOPSYMc=";
+        x86_64-linux = "sha256-KMpSMcLJ/wkySo2gbiECJfH2/hcxdTSLXwKcZLMkvhk=";
+        aarch64-linux = "sha256-Dxs7eRN6nj3e/6pQ3z0d27tnTtD6CefhUxPZGwTVL+Y=";
      }
      .${stdenv.hostPlatform.system} or throwSystem;
  };
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
    bison
    doxygen
  ]
-  ++ lib.optional stdenv.isLinux xvfb
+  ++ lib.optional stdenv.hostPlatform.isLinux xvfb
  ++ lib.optional withWaylandTools wayland-scanner;

  buildInputs = [
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-Denable-wayland=${lib.boolToString withWaylandTools}"
  ];

-  doCheck = stdenv.isLinux; # TODO: disable just a part of the tests
+  doCheck = stdenv.hostPlatform.isLinux; # TODO: disable just a part of the tests
  preCheck = ''
    patchShebangs ../test/
  '';
--- a/pkgs/by-name/li/lifelines/package.nix
+++ b/pkgs/by-name/li/lifelines/package.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation {
    bison
  ];

+  postPatch = ''
+    mkdir -p m4
+  '';
+
  meta = {
    description = "Genealogy tool with ncurses interface";
    homepage = "https://lifelines.github.io/lifelines/";
--- a/pkgs/by-name/ll/llama-swap/package.nix
+++ b/pkgs/by-name/ll/llama-swap/package.nix
@@ -81,7 +81,7 @@ buildGoModule (finalAttrs: {

  checkFlags =
    let
-      skippedTests = lib.optionals (stdenv.isDarwin) [
+      skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [
        # Fail only on *-darwin intermittently
        # https://github.com/mostlygeek/llama-swap/issues/320
        "TestProcess_AutomaticallyStartsUpstream"
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -34,7 +34,7 @@ buildGoModule {
  tags = [
    "sqlite_omit_load_extension"
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    "netgo"
    "osusergo"
  ];
--- a/pkgs/by-name/mc/mcporter/package.nix
+++ b/pkgs/by-name/mc/mcporter/package.nix
@@ -13,19 +13,19 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mcporter";
-  version = "0.10.1";
+  version = "0.10.2";

  src = fetchFromGitHub {
    owner = "steipete";
    repo = "mcporter";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-MaIduY59Q2zVZheN1IYhAWBklQ3n6iJV3KiTMHCML2U=";
+    hash = "sha256-1wBdYetYu+R04Fl50KR3zZK3QO6S95GV+PEO9k3Thhc=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    fetcherVersion = 3;
-    hash = "sha256-jqHEu86dNjJuYBVKDeDlre+KlFEqx55YXZ5K81AK+uY=";
+    hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/md/mdwatch/package.nix
+++ b/pkgs/by-name/md/mdwatch/package.nix
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mdwatch";
-  version = "0.1.24";
+  version = "0.2.0";

  src = fetchFromGitHub {
    owner = "vimlinuz";
    repo = "mdwatch";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dQMGVqCR8DEgKf1G0HG7eCydNju4OBaQ9UMgDD5hdvI=";
+    hash = "sha256-snmyfhOkCTnRsBcKcTTij5caA2NmSA1Csp3+D6BJcw4=";
  };

-  cargoHash = "sha256-5HIc0h042gP4mGr4Yp6ej0fkwNW2SDEzlwITgLF2/7I=";
+  cargoHash = "sha256-CAXHIOC0K062zXNnAD1IW2Sb5Mnpc91A1Lamhc3+NLQ=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
      nim65s
      yzx9
    ];
+    teams = [ lib.teams.geospatial ];
    platforms = with lib.platforms; linux ++ darwin;
  };
 })
--- a/pkgs/by-name/mi/microfetch/package.nix
+++ b/pkgs/by-name/mi/microfetch/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoHash = "sha256-vGvpjRJr4ez322JWUwboVml22vnRVRlwpZ9W4F5wATA=";

-  nativeBuildInputs = lib.optionals stdenv.isLinux [ mold ];
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ];

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/mu/multica-cli/package.nix
+++ b/pkgs/by-name/mu/multica-cli/package.nix
@@ -9,13 +9,13 @@ buildGoModule rec {
  __structuredAttrs = true;

  pname = "multica-cli";
-  version = "0.2.23";
+  version = "0.2.29";

  src = fetchFromGitHub {
    owner = "multica-ai";
    repo = "multica";
    rev = "v${version}";
-    hash = "sha256-2W2OjiKsjaLmKJTr1Rr31eqL/yt+o4XsLFeLwbyv7MY=";
+    hash = "sha256-RW9GXWMOJZGc2RsuKAmfTOol66/XwQLdyK7iPoGFF48=";
  };

  sourceRoot = "${src.name}/server";
--- a/pkgs/by-name/nu/nusmv/package.nix
+++ b/pkgs/by-name/nu/nusmv/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
        throw "only linux and mac x86_64 are currently supported"
    );

-  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

  installPhase = ''
    install -m755 -D bin/NuSMV $out/bin/NuSMV
--- a/pkgs/by-name/op/open5gs/package.nix
+++ b/pkgs/by-name/op/open5gs/package.nix
@@ -83,10 +83,10 @@ stdenv.mkDerivation (finalAttrs: {
    gnutls
    libnghttp2.dev
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    lksctp-tools
  ]
-  ++ lib.optionals (!stdenv.isLinux) [
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
    usrsctp
  ];

--- a/pkgs/by-name/pd/pdf-oxide/package.nix
+++ b/pkgs/by-name/pd/pdf-oxide/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "pdf-oxide";
-  version = "0.3.38";
+  version = "0.3.43";

  src = fetchFromGitHub {
    owner = "yfedoseev";
    repo = "pdf_oxide";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kvV8SzW+2vQ86o/c9vV71O9quqQ2LVvBBvTdTwAG5wY=";
+    hash = "sha256-pIB6x50yIBLsOlKdU9zjeS/71KR0vNc7tmu2QTEn4JA=";
  };

-  cargoHash = "sha256-Z5nNxCrf2QEUA5XCXp5aG59UnznvdS9jjQb57R8gxHs=";
+  cargoHash = "sha256-3Wk5TYZDoCkzR+S186t39oMT9SfubmGXcDuucwIiaac=";
  __structuredAttrs = true;

  cargoBuildFlags = [
--- a/pkgs/by-name/pg/pgsql-tools/package.nix
+++ b/pkgs/by-name/pg/pgsql-tools/package.nix
@@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    makeBinaryWrapper
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    autoPatchelfHook
  ];

-  buildInputs = lib.optionals stdenv.isLinux [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    libxcrypt-legacy
    (lib.getLib stdenv.cc.cc)
  ];
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
    cp -r _internal $out/lib/pgsql-tools/

    makeBinaryWrapper $out/lib/pgsql-tools/ossdbtoolsservice_main $out/bin/ossdbtoolsservice_main \
-      ${lib.optionalString stdenv.isLinux ''--prefix LD_LIBRARY_PATH : "${
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix LD_LIBRARY_PATH : "${
        lib.makeLibraryPath [
          libxcrypt-legacy
          (lib.getLib stdenv.cc.cc)
--- a/pkgs/by-name/pi/pinta/package.nix
+++ b/pkgs/by-name/pi/pinta/package.nix
@@ -47,7 +47,7 @@ buildDotnetModule rec {
    glib
    libadwaita
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # Transitive dylib deps that Pinta's NativeImportResolver dlopen's by bare name.
    # These are not pulled in by wrapGAppsHook4's LD_LIBRARY_PATH on Darwin, so symlink is needed.
    graphene
@@ -73,7 +73,7 @@ buildDotnetModule rec {

  projectFile = "Pinta";

-  env = lib.optionalAttrs (!stdenv.isDarwin) {
+  env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
    LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
  };

@@ -93,7 +93,7 @@ buildDotnetModule rec {
    mkdir -p "$out/share/icons"
    cp -r "$out/lib/Pinta/icons/." "$out/share/icons/"
  ''
-  + lib.optionalString (!stdenv.isDarwin) ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
    dotnet build installer/linux/install.proj \
      -target:Install \
      -p:ContinuousIntegrationBuild=true \
@@ -102,7 +102,7 @@ buildDotnetModule rec {
      -p:PublishDir="$out/lib/Pinta" \
      -p:InstallPrefix="$out"
  ''
-  + lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
    # Symlink all dylibs from runtimeDeps into the assembly dir.
    # GirCore and Pinta's own NativeImportResolver both search here by bare name.
    for dir in ${lib.concatMapStringsSep " " (d: "${lib.getLib d}/lib") runtimeDeps}; do
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -33,7 +33,7 @@ buildGo125Module (finalAttrs: {
        # mount: fusermount: exec: "fusermount": executable file not found in $PATH
        "TestExecuteCmdMountDefault"
      ]
-      ++ lib.optionals stdenv.isDarwin [
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
        "TestBTreeScanMemory"
        "TestBTreeScanPebble"
        "TestExecuteCmdServerDefault"
--- a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix
+++ b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix
@@ -7,16 +7,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "prettier-plugin-jinja-template";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "davidodenwald";
    repo = "prettier-plugin-jinja-template";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qAmN4VJCJana7YbrQC/51JKCbP2DN10HpIt+S88yvPE=";
+    hash = "sha256-OBpY8XYG6Hn2sQpWoJkNJGsnZ1Lh7LAviofgCRFMXwk=";
  };

-  npmDepsHash = "sha256-/m0+z2fSwX77zRY4Yg4xdyI/ZEzAKNUuicaqz0b8f5w=";
+  npmDepsHash = "sha256-YsrDWoaA5EdQi3uzuWBx3Jv1US0qWwkh+636dfvlAkI=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/qd/qdelay/package.nix
+++ b/pkgs/by-name/qd/qdelay/package.nix
@@ -18,7 +18,7 @@
  writableTmpDirAsHomeHook,

  buildVST3 ? true,
-  buildLV2 ? stdenv.isLinux,
+  buildLV2 ? stdenv.hostPlatform.isLinux,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/ra/radicle-tui/package.nix
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  nativeBuildInputs = [ makeBinaryWrapper ];

-  buildInputs = lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    libiconv
    zlib
  ];
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -13,13 +13,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "reaction";
-  version = "2.3.1-11";
+  version = "2.3.1";

  src = fetchFromGitLab {
    domain = "framagit.org";
    owner = "ppom";
    repo = "reaction";
-    rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2";
+    rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; # TODO: return to tagged release
    hash = "sha256-QlSXZ2Wk1OXzAY2x6YjtW+xNchY+Ghb/6AsJgjfgoFE=";
  };

--- a/pkgs/by-name/re/reevr/package.nix
+++ b/pkgs/by-name/re/reevr/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/rk/rkdeveloptool/package.nix
+++ b/pkgs/by-name/rk/rkdeveloptool/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
  # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5
  env.CPPFLAGS = toString (
    lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]
-    ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=vla-cxx-extension" ]
  );

  meta = {
--- a/pkgs/by-name/ro/roc/package.nix
+++ b/pkgs/by-name/ro/roc/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage {
    cmake
    zig_0_13
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    autoPatchelfHook
  ];

@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage {
    llvmPackages.llvm.dev
    makeBinaryWrapper
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    glibc
    stdenv.cc.cc.lib
  ];
@@ -67,13 +67,13 @@ rustPlatform.buildRustPackage {
    '';

  postInstall =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
      wrapProgram $out/bin/roc \
        --set NIX_GLIBC_PATH ${glibc.out}/lib \
        --set NIX_LIBGCC_S_PATH ${stdenv.cc.cc.lib}/lib \
        --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
    ''
-    + lib.optionalString (!stdenv.isLinux) ''
+    + lib.optionalString (!stdenv.hostPlatform.isLinux) ''
      wrapProgram $out/bin/roc --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
    '';

@@ -84,12 +84,12 @@ rustPlatform.buildRustPackage {
  ];

  checkPhase =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
      runHook preCheck
      NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots
      runHook postCheck
    ''
-    + lib.optionalString (!stdenv.isLinux) ''
+    + lib.optionalString (!stdenv.hostPlatform.isLinux) ''
      runHook preCheck
      cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots
      runHook postCheck
--- a/pkgs/by-name/sc/scipopt-zimpl/package.nix
+++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    maintainers = with lib.maintainers; [ pmeinhold ];
    platforms = lib.platforms.linux;
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
    changelog = "https://zimpl.zib.de/download/CHANGELOG.txt";
    description = "Zuse Institute Mathematical Programming Language";
    longDescription = ''
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    "out"
    "doc"
  ]
-  ++ lib.optionals (!stdenv.isDarwin) [
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
    "man"
  ];

--- a/pkgs/by-name/se/segger-jlink/package.nix
+++ b/pkgs/by-name/se/segger-jlink/package.nix
@@ -199,9 +199,9 @@ let
  };

  buildAttrs =
-    if stdenv.isLinux then
+    if stdenv.hostPlatform.isLinux then
      buildAttrsLinux
-    else if stdenv.isDarwin then
+    else if stdenv.hostPlatform.isDarwin then
      buildAttrsDarwin
    else
      throw "platform not supported";
--- a/pkgs/by-name/sg/sg-323/package.nix
+++ b/pkgs/by-name/sg/sg-323/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {

  # Chromium's Darwin toolchain defines _LIBCPP_HARDENING_MODE itself; keep
  # cc-wrapper from injecting a conflicting default.
-  hardeningDisable = lib.optionals stdenv.isDarwin [
+  hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [
    "libcxxhardeningfast"
    "libcxxhardeningextensive"
  ];
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
    gclient2nix.gclientUnpackHook
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    apple-sdk
    xcodebuild
  ];
@@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    pulseaudio
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    llvmPackages.compiler-rt
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
  ];

@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace modules/audio_device/linux/pulseaudiosymboltable_linux.cc \
      --replace-fail "libpulse.so.0" "${pulseaudio}/lib/libpulse.so.0"
  ''
-  + lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
    # Fix Darwin Python script shebangs for sandbox builds
    patchShebangs build/mac/should_use_hermetic_xcode.py build/toolchain/apple/linker_driver.py

@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace build/config/mac/BUILD.gn \
      --replace-fail "apple-macos" "apple-darwin"
  ''
-  + lib.optionalString stdenv.isLinux ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
    substituteInPlace modules/audio_device/linux/alsasymboltable_linux.cc \
      --replace-fail "libasound.so.2" "${alsa-lib}/lib/libasound.so.2"
  '';
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  gnFlags =
-    lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.hostPlatform.isLinux [
      # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags
      # are copied from pkgs/applications/networking/browsers/chromium/common.nix.
      ''target_os="linux"''
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
      ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
      ''host_toolchain="//build/toolchain/linux/unbundle:default"''
    ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      ''target_os="mac"''
      ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"''
      "use_sysroot=true"
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
      "use_custom_libcxx=false"
      ''rust_sysroot_absolute="${buildPackages.rustc}"''
    ]
-    ++ lib.optionals (stdenv.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [
      ''host_toolchain="//build/toolchain/linux/unbundle:host"''
      ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"''
    ];
--- a/pkgs/by-name/si/sirial/package.nix
+++ b/pkgs/by-name/si/sirial/package.nix
@@ -18,7 +18,7 @@
  writableTmpDirAsHomeHook,

  buildVST3 ? true,
-  buildLV2 ? stdenv.isLinux,
+  buildLV2 ? stdenv.hostPlatform.isLinux,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    fontconfig
    freetype
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    libx11
    libxcomposite
--- a/pkgs/by-name/sp/spacetimedb/package.nix
+++ b/pkgs/by-name/sp/spacetimedb/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=codegen"
    "--skip=publish"
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # flakes on darwin in nix build sandbox, timing out waiting for listen addr
    "--skip=cli_can_ping_spacetimedb_on_disk"
    "--skip=cli_can_publish_spacetimedb_on_disk"
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -39,7 +39,7 @@
 }:

 let
-  glLibs = lib.optionals stdenv.isLinux [
+  glLibs = lib.optionals stdenv.hostPlatform.isLinux [
    libGL
    libGLU
    libglut
@@ -73,7 +73,7 @@ let
    stdenv.cc.cc.lib
  ];
  runtimeLibPath = lib.makeLibraryPath runtimeLibs;
-  libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
+  libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
 in
 stdenv.mkDerivation (finalAttrs: {
  version = "2.4.2";
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
  postInstall = ''
    substituteInPlace "$out/share/applications/speed-dreams.desktop" \
      --replace-fail "Exec=$out/games/speed-dreams-2" "Exec=speed-dreams"
-    ${lib.optionalString stdenv.isLinux ''
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
      # Symlink for desktop icon
      mkdir -p $out/share/icons/hicolor/{96x96,scalable}/apps
      ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/icons/hicolor/96x96/apps/speed-dreams-2.png"
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
    makeWrapperArgs=(
      --prefix ${libPathVar} : "$out/lib/games/speed-dreams-2/lib:$out/lib:${runtimeLibPath}"
    )
-    ${lib.optionalString stdenv.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"}
+    ${lib.optionalString stdenv.hostPlatform.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"}
    makeWrapper "$out/games/speed-dreams-2" "$out/bin/speed-dreams" "''${makeWrapperArgs[@]}"
  '';

@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
    minizip
    rhash
  ]
-  ++ lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    libGL
    libGLU
    libglut
--- a/pkgs/by-name/sp/spotify/darwin.nix
+++ b/pkgs/by-name/sp/spotify/darwin.nix
@@ -11,7 +11,7 @@
 stdenv.mkDerivation {
  inherit pname;

-  version = "1.2.84.476";
+  version = "1.2.88.483";

  src =
    # WARNING: This Wayback Machine URL redirects to the closest timestamp.
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
    # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
    if stdenv.hostPlatform.isAarch64 then
      (fetchurl {
-        url = "https://web.archive.org/web/20260228212834/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-Zj5qATaW1QPTInC/Y/jZx2xq5eHG/OQixpj8DWUpEXY=";
+        url = "https://web.archive.org/web/20260501151114/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-rBoJ5PKge4pr90FqYwsG+6JqyKvc3sKyPXM7OXXEmz8=";
      })
    else
      (fetchurl {
-        url = "https://web.archive.org/web/20260228213541/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-4Lm4g0gAQ3EA7Sj2wDTbjEXRxcNoGWHLvdEx/57nry4=";
+        url = "https://web.archive.org/web/20260501151019/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-o/qDYnVhkrca2TBDoqxsKWq0QfDQyHdhU4llbmIGUBQ=";
      });

  nativeBuildInputs = [ undmg ];
--- a/pkgs/by-name/sp/spotify/linux.nix
+++ b/pkgs/by-name/sp/spotify/linux.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
  # If an update breaks things, one of those might have valuable info:
  # https://aur.archlinux.org/packages/spotify/
  # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.2.82.428.g0ac8be2b";
+  version = "1.2.84.475.ga1a748ff";

  # To get the latest stable revision:
  # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
  # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
  # More examples of api usage:
  # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "92";
+  rev = "93";

  # fetch from snapcraft instead of the debian repository most repos fetch from.
  # That is a bit more cumbersome. But the debian repository only keeps the last
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchurl {
    name = "spotify-${finalAttrs.version}-${finalAttrs.rev}.snap";
    url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${finalAttrs.rev}.snap";
-    hash = "sha512-/9lB4gLotYvM2QkHt8cKS8P4IXrBVzgoXEk4bWR3GQum0OnJqK/qCC9evmCZ7PAqbbyh5/8vSblM+QXXXiQiMA==";
+    hash = "sha512-X9IslXh1MHExJpBu45mXnIowdhmvkBko+fupk23WhKNoUPSR37jbj5Ee4V2ZYKxCtgyDgX8Px1YKynu3KEVUFg==";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/st/star/package.nix
+++ b/pkgs/by-name/st/star/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [ xxd ];

-  buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ];
+  buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];

  enableParallelBuilding = true;

  makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "CXXFLAGS_SIMD=" ];

-  preBuild = lib.optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
    export CXXFLAGS="$CXXFLAGS -DSHM_NORESERVE=0"
  '';

--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -50,7 +50,7 @@ buildGoModule (finalAttrs: {
  preCheck = ''
    # Remove test that requires networking
    rm pkg/plugin/aqua/client/client_integration_test.go
-    ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+    ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
      # Remove "[It] should make a request to fetch registries" test that fails on x86_64-darwin
      rm pkg/plugin/aqua/client/client_test.go
    ''}
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -8,13 +8,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "statix";
-  version = "0-unstable-2026-05-03";
+  version = "0-unstable-2026-05-09";

  src = fetchFromGitHub {
    owner = "molybdenumsoftware";
    repo = "statix";
-    rev = "91e28aa76179b5769e8eff7ff4b09464d0913f27";
-    hash = "sha256-JDCJ8fgIs5ZdYygQxlR63H/V4VyfmVMR4FleWwAl+AM=";
+    rev = "f61bc82c0c90569de508f0c71a6ba7f4aba9cca7";
+    hash = "sha256-4LtWT+BFSPaq5DXQPlZ+xVrW/osS9yhG5T0tEfSdczs=";
  };

  cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ=";
--- a/pkgs/by-name/su/superfile/package.nix
+++ b/pkgs/by-name/su/superfile/package.nix
@@ -37,7 +37,7 @@ buildGoModule {
  checkFlags = [
    "-skip=^TestReturnDirElement/Sort_by_Date$"
  ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # Only failing on nix darwin. I suspect this is due to the way
    # darwin handles file permissions.
    "-skip=^TestCompressSelectedFiles"
--- a/Show More
+++ b/Show More