Merge staging-next into staging

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

@@ -803,6 +803,8 @@
 
 - The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier.
 
+- The `boot.loader.raspberryPi` options were marked as deprecated in 23.11 and have now been removed.
+
 - Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11.
 
 - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an

nixos/lib/qemu-common.nix

@@ -57,7 +57,7 @@ rec {
       throwUnsupportedGuestSystem = guestMap:
         throw "Unsupported guest system ${guestSystem} for host ${hostSystem}, supported: ${lib.concatStringsSep ", " (lib.attrNames guestMap)}";
     in
-    if hostStdenv.isLinux then
+    if hostStdenv.hostPlatform.isLinux then
       linuxHostGuestMatrix.${guestSystem} or "${qemuPkg}/bin/qemu-kvm"
     else
       let

nixos/modules/module-list.nix

@@ -1632,7 +1632,6 @@
   ./system/boot/loader/external/external.nix
   ./system/boot/loader/init-script/init-script.nix
   ./system/boot/loader/loader.nix
-  ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/loader/systemd-boot/systemd-boot.nix
   ./system/boot/luksroot.nix
   ./system/boot/stratisroot.nix

nixos/modules/rename.nix

@@ -20,6 +20,7 @@ in
     (mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
 
     # Completely removed modules
+    (mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ] "The raspberryPi boot loader has been removed. See https://github.com/NixOS/nixpkgs/pull/241534 for what to use instead.")
     (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
     (mkRemovedOptionModule [ "environment" "noXlibs" ] ''
       The environment.noXlibs option was removed, as it often caused surprising breakages for new users.

nixos/modules/services/databases/postgresql.nix

@@ -492,7 +492,7 @@ in
         mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";
         mkWarn = ver: warn ''
           The postgresql package is not pinned and selected automatically by
-          `systemd.stateVersion`. Right now this is `pkgs.postgresql_${ver}`, the
+          `system.stateVersion`. Right now this is `pkgs.postgresql_${ver}`, the
           oldest postgresql version available and thus the next that will be
           removed when EOL on the next stable cycle.
 

nixos/modules/services/networking/clatd.nix

@@ -13,6 +13,11 @@ in
 
       package = lib.mkPackageOption pkgs "clatd" { };
 
+      enableNetworkManagerIntegration = lib.mkEnableOption "NetworkManager integration" // {
+        default = config.networking.networkmanager.enable;
+        defaultText = "config.networking.networkmanager.enable";
+      };
+
       settings = lib.mkOption {
         type = lib.types.submodule ({ name, ... }: {
           freeformType = settingsFormat.type;
@@ -75,5 +80,17 @@ in
         ];
       };
     };
+
+    networking.networkmanager.dispatcherScripts = cfg.enableNetworkManagerIntegration [
+      {
+        type = "basic";
+        # https://github.com/toreanderson/clatd/blob/master/scripts/clatd.networkmanager
+        source = pkgs.writeShellScript "restart-clatd" ''
+          [ "$DEVICE_IFACE" = "clat" ] && exit 0
+          [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
+          ${pkgs.systemd}/bin/systemctl restart clatd.service
+        '';
+      }
+    ];
   };
 }

nixos/modules/services/networking/spiped.nix

@@ -186,6 +186,7 @@ in
         Restart   = "always";
         User      = "spiped";
       };
+      stopIfChanged = false;
 
       scriptArgs = "%i";
       script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`";

nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix

@@ -1,9 +0,0 @@
-{ pkgs, configTxt, firmware ? pkgs.raspberrypifw }:
-
-pkgs.substituteAll {
-  src = ./raspberrypi-builder.sh;
-  isExecutable = true;
-  inherit (pkgs) bash;
-  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-  inherit firmware configTxt;
-}

nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh

@@ -1,143 +0,0 @@
-#! @bash@/bin/sh
-
-# This can end up being called disregarding the shebang.
-set -e
-
-shopt -s nullglob
-
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin; done
-
-usage() {
-    echo "usage: $0 -c <path-to-default-configuration> [-d <boot-dir>]" >&2
-    exit 1
-}
-
-default=                # Default configuration
-target=/boot            # Target directory
-
-while getopts "c:d:" opt; do
-    case "$opt" in
-        c) default="$OPTARG" ;;
-        d) target="$OPTARG" ;;
-        \?) usage ;;
-    esac
-done
-
-echo "updating the boot generations directory..."
-
-mkdir -p $target/old
-
-# Convert a path to a file in the Nix store such as
-# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
-cleanName() {
-    local path="$1"
-    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
-}
-
-# Copy a file from the Nix store to $target/kernels.
-declare -A filesCopied
-
-copyToKernelsDir() {
-    local src="$1"
-    local dst="$target/old/$(cleanName $src)"
-    # Don't copy the file if $dst already exists.  This means that we
-    # have to create $dst atomically to prevent partially copied
-    # kernels or initrd if this script is ever interrupted.
-    if ! test -e $dst; then
-        local dstTmp=$dst.tmp.$$
-        cp $src $dstTmp
-        mv $dstTmp $dst
-    fi
-    filesCopied[$dst]=1
-    result=$dst
-}
-
-copyForced() {
-    local src="$1"
-    local dst="$2"
-    cp $src $dst.tmp
-    mv $dst.tmp $dst
-}
-
-outdir=$target/old
-mkdir -p $outdir || true
-
-# Copy its kernel and initrd to $target/old.
-addEntry() {
-    local path="$1"
-    local generation="$2"
-
-    if ! test -e $path/kernel -a -e $path/initrd; then
-        return
-    fi
-
-    local kernel=$(readlink -f $path/kernel)
-    local initrd=$(readlink -f $path/initrd)
-    local dtb_path=$(readlink -f $path/dtbs)
-
-    if test -n "@copyKernels@"; then
-        copyToKernelsDir $kernel; kernel=$result
-        copyToKernelsDir $initrd; initrd=$result
-    fi
-
-    echo $(readlink -f $path) > $outdir/$generation-system
-    echo $(readlink -f $path/init) > $outdir/$generation-init
-    cp $path/kernel-params $outdir/$generation-cmdline.txt
-    echo $initrd > $outdir/$generation-initrd
-    echo $kernel > $outdir/$generation-kernel
-
-    if test "$generation" = "default"; then
-      copyForced $kernel $target/kernel.img
-      copyForced $initrd $target/initrd
-      for dtb in $dtb_path/{broadcom,}/bcm*.dtb; do
-        dst="$target/$(basename $dtb)"
-        copyForced $dtb "$dst"
-        filesCopied[$dst]=1
-      done
-      cp "$(readlink -f "$path/init")" $target/nixos-init
-      echo "`cat $path/kernel-params` init=$path/init" >$target/cmdline.txt
-    fi
-}
-
-addEntry $default default
-
-# Add all generations of the system profile to the menu, in reverse
-# (most recent to least recent) order.
-for generation in $(
-    (cd /nix/var/nix/profiles && ls -d system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
-    | sort -n -r); do
-    link=/nix/var/nix/profiles/system-$generation-link
-    addEntry $link $generation
-done
-
-# Add the firmware files
-fwdir=@firmware@/share/raspberrypi/boot/
-copyForced $fwdir/bootcode.bin  $target/bootcode.bin
-copyForced $fwdir/fixup.dat     $target/fixup.dat
-copyForced $fwdir/fixup4.dat    $target/fixup4.dat
-copyForced $fwdir/fixup4cd.dat  $target/fixup4cd.dat
-copyForced $fwdir/fixup4db.dat  $target/fixup4db.dat
-copyForced $fwdir/fixup4x.dat   $target/fixup4x.dat
-copyForced $fwdir/fixup_cd.dat  $target/fixup_cd.dat
-copyForced $fwdir/fixup_db.dat  $target/fixup_db.dat
-copyForced $fwdir/fixup_x.dat   $target/fixup_x.dat
-copyForced $fwdir/start.elf     $target/start.elf
-copyForced $fwdir/start4.elf    $target/start4.elf
-copyForced $fwdir/start4cd.elf  $target/start4cd.elf
-copyForced $fwdir/start4db.elf  $target/start4db.elf
-copyForced $fwdir/start4x.elf   $target/start4x.elf
-copyForced $fwdir/start_cd.elf  $target/start_cd.elf
-copyForced $fwdir/start_db.elf  $target/start_db.elf
-copyForced $fwdir/start_x.elf   $target/start_x.elf
-
-# Add the config.txt
-copyForced @configTxt@ $target/config.txt
-
-# Remove obsolete files from $target and $target/old.
-for fn in $target/old/*linux* $target/old/*initrd-initrd* $target/bcm*.dtb; do
-    if ! test "${filesCopied[$fn]}" = 1; then
-        rm -vf -- "$fn"
-    fi
-done

nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix

@@ -1,151 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.boot.loader.raspberryPi;
-
-  builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
-  builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
-
-  builder =
-    if cfg.uboot.enable then
-      "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
-    else
-      "${builderGeneric} -c";
-
-  blCfg = config.boot.loader;
-  timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
-
-  isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
-  optional = pkgs.lib.optionalString;
-
-  configTxt =
-    pkgs.writeText "config.txt" (''
-      # U-Boot used to need this to work, regardless of whether UART is actually used or not.
-      # TODO: check when/if this can be removed.
-      enable_uart=1
-
-      # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
-      # when attempting to show low-voltage or overtemperature warnings.
-      avoid_warnings=1
-    '' + optional isAarch64 ''
-      # Boot in 64-bit mode.
-      arm_64bit=1
-    '' + (if cfg.uboot.enable then ''
-      kernel=u-boot-rpi.bin
-    '' else ''
-      kernel=kernel.img
-      initramfs initrd followkernel
-    '') + optional (cfg.firmwareConfig != null) cfg.firmwareConfig);
-
-in
-
-{
-  options = {
-
-    boot.loader.raspberryPi = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Whether to create files with the system generations in
-          `/boot`.
-          `/boot/old` will hold files from old generations.
-
-          ::: {.note}
-          These options are deprecated, unsupported, and may not work like expected.
-          :::
-        '';
-      };
-
-      version = mkOption {
-        default = 2;
-        type = types.enum [ 0 1 2 3 4 ];
-        description = "";
-      };
-
-      uboot = {
-        enable = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Enable using uboot as bootmanager for the raspberry pi.
-
-            ::: {.note}
-            These options are deprecated, unsupported, and may not work like expected.
-            :::
-          '';
-        };
-
-        configurationLimit = mkOption {
-          default = 20;
-          example = 10;
-          type = types.int;
-          description = ''
-            Maximum number of configurations in the boot menu.
-
-            ::: {.note}
-            These options are deprecated, unsupported, and may not work like expected.
-            :::
-          '';
-        };
-
-      };
-
-      firmwareConfig = mkOption {
-        default = null;
-        type = types.nullOr types.lines;
-        description = ''
-          Extra options that will be appended to `/boot/config.txt` file.
-          For possible values, see: https://www.raspberrypi.com/documentation/computers/config_txt.html
-
-          ::: {.note}
-          These options are deprecated, unsupported, and may not work like expected.
-          :::
-        '';
-      };
-    };
-  };
-
-  config = mkMerge[
-    (mkIf cfg.uboot.enable {
-      warnings = [
-        ''
-          The option set for `boot.loader.raspberrypi.uboot` has been recommended against
-          for years, and is now formally deprecated.
-
-          It is possible it already did not work like you expected.
-
-          It never worked on the Raspberry Pi 4 family.
-
-          These options will be removed by NixOS 24.11.
-        ''
-      ];
-    })
-    (mkIf cfg.enable {
-      warnings = [
-        ''
-          The option set for `boot.loader.raspberrypi` has been recommended against
-          for years, and is now formally deprecated.
-
-          It is possible it already did not work like you expected.
-
-          It never worked on the Raspberry Pi 4 family.
-
-          These options will be removed by NixOS 24.11.
-        ''
-      ];
-    })
-    (mkIf cfg.enable {
-      assertions = singleton {
-        assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version >= 3;
-        message = "Only Raspberry Pi >= 3 supports aarch64.";
-      };
-
-      system.build.installBootLoader = builder;
-      system.boot.loader.id = "raspberrypi";
-      system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
-    })
-  ];
-}

nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix

@@ -1,37 +0,0 @@
-{ pkgs, version, configTxt }:
-
-let
-  isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
-
-  uboot =
-    if version == 0 then
-      pkgs.ubootRaspberryPiZero
-    else if version == 1 then
-      pkgs.ubootRaspberryPi
-    else if version == 2 then
-      pkgs.ubootRaspberryPi2
-    else if version == 3 then
-      if isAarch64 then
-        pkgs.ubootRaspberryPi3_64bit
-      else
-        pkgs.ubootRaspberryPi3_32bit
-    else
-      throw "U-Boot is not yet supported on the raspberry pi 4.";
-
-  extlinuxConfBuilder =
-    import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
-      pkgs = pkgs.buildPackages;
-    };
-in
-pkgs.substituteAll {
-  src = ./uboot-builder.sh;
-  isExecutable = true;
-  inherit (pkgs) bash;
-  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-  firmware = pkgs.raspberrypifw;
-  inherit uboot;
-  inherit configTxt;
-  inherit extlinuxConfBuilder;
-  inherit version;
-}
-

nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh

@@ -1,38 +0,0 @@
-#! @bash@/bin/sh -e
-
-target=/boot # Target directory
-
-while getopts "t:c:d:g:" opt; do
-    case "$opt" in
-        d) target="$OPTARG" ;;
-        *) ;;
-    esac
-done
-
-copyForced() {
-    local src="$1"
-    local dst="$2"
-    cp $src $dst.tmp
-    mv $dst.tmp $dst
-}
-
-# Call the extlinux builder
-"@extlinuxConfBuilder@" "$@"
-
-# Add the firmware files
-fwdir=@firmware@/share/raspberrypi/boot/
-copyForced $fwdir/bootcode.bin  $target/bootcode.bin
-copyForced $fwdir/fixup.dat     $target/fixup.dat
-copyForced $fwdir/fixup_cd.dat  $target/fixup_cd.dat
-copyForced $fwdir/fixup_db.dat  $target/fixup_db.dat
-copyForced $fwdir/fixup_x.dat   $target/fixup_x.dat
-copyForced $fwdir/start.elf     $target/start.elf
-copyForced $fwdir/start_cd.elf  $target/start_cd.elf
-copyForced $fwdir/start_db.elf  $target/start_db.elf
-copyForced $fwdir/start_x.elf   $target/start_x.elf
-
-# Add the uboot file
-copyForced @uboot@/u-boot.bin $target/u-boot-rpi.bin
-
-# Add the config.txt
-copyForced @configTxt@ $target/config.txt

pkgs/applications/radio/sdrangel/default.nix

@@ -69,48 +69,50 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    airspy
-    airspyhf
-    aptdec
-    boost
-    cm256cc
-    codec2
-    dab_lib
-    dsdcc
-    faad2
-    ffmpeg
-    fftwFloat
-    flac
-    glew
-    hackrf
-    hidapi
-    libbladeRF
-    libiio
-    libopus
-    libpulseaudio
-    libusb1
-    limesuite
-    mbelib
-    opencv4
-    qt5compat
-    qtcharts
-    qtdeclarative
-    qtlocation
-    qtmultimedia
-    qtscxml
-    qtserialport
-    qtspeech
-    qttools
-    qtwebsockets
-    qtwebengine
-    rtl-sdr
-    serialdv
-    sgp4
-    soapysdr-with-plugins
-    uhd
-    zlib
-  ] ++ lib.optionals stdenv.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];
+  buildInputs =
+    [
+      airspy
+      airspyhf
+      aptdec
+      boost
+      cm256cc
+      codec2
+      dab_lib
+      dsdcc
+      faad2
+      ffmpeg
+      fftwFloat
+      flac
+      glew
+      hackrf
+      hidapi
+      libbladeRF
+      libiio
+      libopus
+      libpulseaudio
+      libusb1
+      limesuite
+      mbelib
+      opencv4
+      qt5compat
+      qtcharts
+      qtdeclarative
+      qtlocation
+      qtmultimedia
+      qtscxml
+      qtserialport
+      qtspeech
+      qttools
+      qtwebsockets
+      qtwebengine
+      rtl-sdr
+      serialdv
+      sgp4
+      soapysdr-with-plugins
+      uhd
+      zlib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];
 
   cmakeFlags = [
     "-DAPT_DIR=${aptdec}"

pkgs/applications/science/misc/root/default.nix

@@ -230,7 +230,7 @@ stdenv.mkDerivation rec {
 
   # workaround for
   # https://github.com/root-project/root/issues/14778
-  env.NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}";
+  env.NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}";
 
   # To use the debug information on the fly (without installation)
   # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format)

pkgs/build-support/rust/build-rust-package/default.nix

@@ -104,7 +104,7 @@ assert useSysroot -> !(args.doCheck or true);
 
 stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot {
   RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
-} // lib.optionalAttrs (stdenv.isDarwin && buildType == "debug") {
+} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
   RUSTFLAGS =
     "-C split-debuginfo=packed "
     + lib.optionalString useSysroot "--sysroot ${sysroot} "

pkgs/by-name/al/almo/package.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   makeFlags = [ "all" ];
 
   # remove darwin-only linker flag on linux
-  postPatch = lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace scripts/pybind.sh \
       --replace-fail " -undefined dynamic_lookup" ""
   '';

pkgs/by-name/ar/arti/package.nix

@@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ sqlite ]
-    ++ lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
         CoreServices

pkgs/by-name/ba/backrest/package.nix

@@ -51,7 +51,7 @@ buildGoModule {
         [
           "TestServeIndex" # Fails with handler returned wrong content encoding
         ]
-        ++ lib.optionals stdenv.isDarwin [
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
           "TestBackup" # relies on ionice
         ];
     in

pkgs/by-name/bi/binsider/package.nix

@@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE=";
 
-  buildNoDefaultFeatures = !stdenv.isLinux;
+  buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux;
 
-  buildInputs = lib.optionals stdenv.isDarwin (
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
     [
       AppKit

pkgs/by-name/bi/bisq2/package.nix

@@ -0,0 +1,169 @@
+{
+  stdenvNoCC,
+  lib,
+  makeWrapper,
+  runtimeShell,
+  fetchurl,
+  makeDesktopItem,
+  copyDesktopItems,
+  imagemagick,
+  jdk23,
+  dpkg,
+  writeShellScript,
+  bash,
+  tor,
+  zip,
+  gnupg,
+}:
+
+let
+  version = "2.1.2";
+
+  jdk = jdk23.override { enableJavaFX = true; };
+
+  bisq-launcher =
+    args:
+    writeShellScript "bisq-launcher" ''
+      # This is just a comment to convince Nix that Tor is a
+      # runtime dependency; The Tor binary is in a *.jar file,
+      # whereas Nix only scans for hashes in uncompressed text.
+      # ${lib.getExe' tor "tor"}
+
+      rm -fR $HOME/.local/share/Bisq2/tor
+
+      exec "${lib.getExe jdk}" -Djpackage.app-version=@version@ -classpath @out@/lib/app/desktop-app-launcher.jar:@out@/lib/app/* ${args} bisq.desktop_app_launcher.DesktopAppLauncher "$@"
+    '';
+
+  # A given release will be signed by either Alejandro Garcia or Henrik Jannsen
+  # as indicated in the file
+  # https://github.com/bisq-network/bisq2/releases/download/v${version}/signingkey.asc
+  publicKey =
+    {
+      "E222AA02" = fetchurl {
+        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
+        sha256 = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
+      };
+
+      "387C8307" = fetchurl {
+        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
+        sha256 = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
+      };
+    }
+    ."387C8307";
+in
+stdenvNoCC.mkDerivation rec {
+  inherit version;
+
+  pname = "bisq2";
+
+  src = fetchurl {
+    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
+    sha256 = "0zgv70xlz3c9mrwmiaa1dgagbc441ppk2vrkgard8zjrvk8rg7va";
+
+    # Verify the upstream Debian package prior to extraction.
+    # See https://bisq.wiki/Bisq_2#Installation
+    # This ensures that a successful build of this Nix package requires the Debian
+    # package to pass verification.
+    nativeBuildInputs = [ gnupg ];
+    downloadToTemp = true;
+
+    postFetch = ''
+      pushd $(mktemp -d)
+      export GNUPGHOME=./gnupg
+      mkdir -m 700 -p $GNUPGHOME
+      ln -s $downloadedFile ./Bisq-${version}.deb
+      ln -s ${signature} ./signature.asc
+      gpg --import ${publicKey}
+      gpg --batch --verify signature.asc Bisq-${version}.deb
+      popd
+      mv $downloadedFile $out
+    '';
+  };
+
+  signature = fetchurl {
+    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
+    sha256 = "sha256-WZhI8RDmb7nQqpCQJM86vrp8qQNg+mvRVdSPcDqgzxE=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    dpkg
+    imagemagick
+    makeWrapper
+    zip
+    gnupg
+    makeWrapper
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "bisq2";
+      exec = "bisq2";
+      icon = "bisq2";
+      desktopName = "Bisq 2";
+      genericName = "Decentralized bitcoin exchange";
+      categories = [
+        "Network"
+        "P2P"
+      ];
+    })
+
+    (makeDesktopItem {
+      name = "bisq2-hidpi";
+      exec = "bisq2-hidpi";
+      icon = "bisq2";
+      desktopName = "Bisq 2 (HiDPI)";
+      genericName = "Decentralized bitcoin exchange";
+      categories = [
+        "Network"
+        "P2P"
+      ];
+    })
+  ];
+
+  unpackPhase = ''
+    dpkg -x $src .
+  '';
+
+  buildPhase = ''
+    # Replace the Tor binary embedded in tor.jar (which is in the zip archive tor.zip)
+    # with the Tor binary from Nixpkgs.
+
+    makeWrapper ${lib.getExe' tor "tor"} ./tor
+    zip tor.zip ./tor
+    zip opt/bisq2/lib/app/tor.jar tor.zip
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib $out/bin
+    cp -r opt/bisq2/lib/app $out/lib
+
+    install -D -m 777 ${bisq-launcher ""} $out/bin/bisq2
+    substituteAllInPlace $out/bin/bisq2
+
+    install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq2-hidpi
+    substituteAllInPlace $out/bin/bisq2-hidpi
+
+    for n in 16 24 32 48 64 96 128 256; do
+      size=$n"x"$n
+      magick convert opt/bisq2/lib/Bisq2.png -resize $size bisq2.png
+      install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq2.png
+    done;
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Decentralized bitcoin exchange network";
+    homepage = "https://bisq.network";
+    mainProgram = "bisq2";
+    sourceProvenance = with sourceTypes; [
+      binaryBytecode
+    ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ emmanuelrosa ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/by-name/bi/bitwarden-desktop/package.nix

@@ -167,7 +167,7 @@ in buildNpmPackage rec {
 
     mkdir $out
 
-    pushd apps/desktop/dist/linux-${lib.optionalString stdenv.isAarch64 "arm64-"}unpacked
+    pushd apps/desktop/dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked
     mkdir -p $out/opt/Bitwarden
     cp -r locales resources{,.pak} $out/opt/Bitwarden
     popd

pkgs/by-name/ca/cargo-tauri/test-app.nix

@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [ openssl ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       glib-networking
       libayatana-appindicator
       webkitgtk_4_1

pkgs/by-name/ch/chatd/package.nix

@@ -34,7 +34,7 @@ buildNpmPackage rec {
     makeWrapper
     electron
     pkg-config
-  ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs
+  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; # for onnx libs
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime

pkgs/by-name/co/composer-require-checker/package.nix

@@ -5,16 +5,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer-require-checker";
-  version = "4.13.0";
+  version = "4.14.0";
 
   # Upstream no longer provides the composer.lock in their release artifact
   src = fetchgit {
     url = "https://github.com/maglnet/ComposerRequireChecker";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-xq8W5SXwtmJ3uu5g26/rxL02jqBuxvEEQpwazPdCE5Y=";
+    hash = "sha256-dBUDkgbuUBKA3MKB4fxwHhDoT9wYRl49m/2ZCvIcNMM=";
   };
 
-  vendorHash = "sha256-GGT/9kBpd7PU/pMJFWw1rrEW2QFUlrp3lljUCyo+/bw=";
+  vendorHash = "sha256-JNdSek3f3WEtJQHjSV+HF6b8l9eZvbI0n4g3UUUVja4=";
 
   meta = {
     description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";

pkgs/by-name/co/conserve/package.nix

@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE=";
 
-  buildInputs = lib.optionals (stdenv.isDarwin) [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
     darwin.apple_sdk.frameworks.Security
   ];
 

pkgs/by-name/co/copycat/package.nix

@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-oNX1MUpOjRG02FHOU7zpktLAYKu/1+R2d96jC/VA0co=";
 
-  buildInputs = lib.optionals (stdenv.isDarwin) [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
     darwin.apple_sdk_11_0.frameworks.AppKit
   ];
 

pkgs/by-name/cy/cyrus-imapd/package.nix

@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       bison
       libsrs2
     ]
-    ++ lib.optionals stdenv.isLinux [ libcap ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]
     ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [
       brotli.dev
       libical.dev
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
           cyrus_sasl
         ]
         # Darwin doesn't have libuuid, try to build without it
-        ++ lib.optional (!stdenv.isDarwin) libuuid;
+        ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
       imapLibs = managesieveLibs ++ [ pcre2 ];
       mkLibsString = lib.strings.concatMapStringsSep " " (l: "-L${lib.getLib l}/lib");
     in

pkgs/by-name/du/dut/package.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = lib.platforms.all;
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
     description = "A disk usage calculator for Linux";
     homepage = "https://codeberg.org/201984/dut";
     license = lib.licenses.gpl3;

pkgs/by-name/en/ente-cli/package.nix

@@ -62,7 +62,7 @@ buildGoModule {
 
   passthru = {
     # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin
-    tests.version = lib.optionalAttrs stdenv.isLinux (
+    tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (
       testers.testVersion {
         package = ente-cli;
         command = ''

pkgs/by-name/er/erlang-language-platform/package.nix

@@ -5,9 +5,12 @@
   autoPatchelfHook,
 }:
 let
-  arch = if stdenv.isAarch64 then "aarch64" else "x86_64";
+  arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64";
   release =
-    if stdenv.isDarwin then "macos-${arch}-apple-darwin" else "linux-${arch}-unknown-linux-gnu";
+    if stdenv.hostPlatform.isDarwin then
+      "macos-${arch}-apple-darwin"
+    else
+      "linux-${arch}-unknown-linux-gnu";
 
   hashes = {
     linux-aarch64-unknown-linux-gnu = "sha256-vWMrq/uFU/uyuDnsxZK0ZyvtraVCZwvGjzO1a5QjR8g=";

pkgs/by-name/ex/exo/package.nix

@@ -63,7 +63,7 @@ python3Packages.buildPythonApplication {
   ];
 
   # Tests require `mlx` which is not supported on linux.
-  doCheck = stdenv.isDarwin;
+  doCheck = stdenv.hostPlatform.isDarwin;
 
   passthru = {
     updateScript = unstableGitUpdater {

pkgs/by-name/ex/exploitdb/package.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2024-10-02";
+  version = "2024-11-16";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-uNFBMZ6pk/xT6OZMb8EKax141lc+uumQl3xbihFMYAI=";
+    hash = "sha256-49xG3mVh5M9MfK4WuU3rc9Q+QlZo7IyV3jwAdBUEmu0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/fi/fido2-manage/package.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       pkg-config
       cmake
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       copyDesktopItems
       imagemagick
     ];
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
       openssl
       zlib
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       xterm
       udev
       pcsclite
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libuv
       libsolv
       libcouchbase
@@ -80,23 +80,23 @@ stdenv.mkDerivation rec {
       substituteInPlace ./src/libfido2.pc.in \
         --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace ./CMakeLists.txt \
         --replace-fail "/\''${CMAKE_INSTALL_LIBDIR}" "/lib"
     '';
 
   postInstall =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
       install $src/fido2-manage.sh $out/bin/fido2-manage
       magick ${icon} -background none -gravity center -extent 512x512 token2.png
       install -Dm444 token2.png $out/share/icons/hicolor/512x512/apps/token2.png
       install $src/gui.py $out/bin/fido2-manage-gui
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install $src/fido2-manage-mac.sh $out/bin/fido2-manage
     '';
 
-  desktopItems = lib.optionals stdenv.isLinux [
+  desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
     (makeDesktopItem rec {
       desktopName = "Fido2 Manager";
       name = "fido2-manage";
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
         --replace-fail "./fido2-manage.sh" "fido2-manage" \
         --replace-fail "awk" "${gawk}/bin/awk"
     ''
-    + lib.optionalString stdenv.isLinux ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace $out/bin/fido2-manage-gui \
         --replace-fail "./fido2-manage.sh" "$out/bin/fido2-manage" \
         --replace-fail "x-terminal-emulator" "${xterm}/bin/xterm" \
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
 
       sed -i '1i #!${pythonEnv.interpreter}' $out/bin/fido2-manage-gui
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace $out/bin/fido2-manage \
         --replace-fail "ggrep" "${gnugrep}/bin/grep"
     '';

pkgs/by-name/ga/gapcast/package.nix

@@ -37,6 +37,6 @@ buildGoModule rec {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gapcast";
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

pkgs/by-name/gm/gmt/package.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE =
       lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration "
       + lib.optionalString (
-        stdenv.isDarwin
+        stdenv.hostPlatform.isDarwin
         && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3"
       ) "-D__LAPACK_int=int";
   };
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       gshhg-gmt
     ]
     ++ (
-      if stdenv.isDarwin then
+      if stdenv.hostPlatform.isDarwin then
         with darwin.apple_sdk.frameworks;
         [
           Accelerate
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
       (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL")
     ]
-    ++ (lib.optionals (!stdenv.isDarwin) [
+    ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) [
       (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}")
       (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so")
       (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so")

pkgs/by-name/go/go2rtc/package.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "go2rtc";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU=";
+    hash = "sha256-pxKocvnFy1XMrjQ57VAmCnavcBgVPuNqWzT0v5+pWMI=";
   };
 
   vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU=";

pkgs/by-name/go/gomanagedocker/package.nix

@@ -23,8 +23,8 @@ buildGoModule {
   vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak=";
 
   buildInputs =
-    lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-    ++ lib.optionals stdenv.isLinux [ xorg.libX11 ];
+    lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
 
   ldflags = [
     "-s"

pkgs/by-name/gr/greenmask/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "greenmask";
-  version = "0.2.0";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ouDYXXlmvLRuR6ATUAk2Gn9toTVxRwQY1CgMyQUN/B0=";
+    hash = "sha256-wAYkr6vCqRQIfZaK31/NSluZZbZYGN5QJkLgdubEGoM=";
   };
 
-  vendorHash = "sha256-M7HcTQp4pzfSLvyCiV/loqqprKM1B93LOr4wxOVoHjk=";
+  vendorHash = "sha256-D4XMEFi0uk6ogdo6+G1k/g16QpHynB1OjdoGcY2fSds=";
 
   subPackages = [ "cmd/greenmask/" ];
 

pkgs/by-name/im/imhex/package.nix

@@ -39,7 +39,7 @@ let
     let
       baseStdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
     in
-    if stdenv.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv;
+    if stdenv.hostPlatform.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv;
 
   patterns_src = fetchFromGitHub {
     name = "ImHex-Patterns-source-${patterns_version}";
@@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ];
 
   # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace cmake/modules/PostprocessBundle.cmake \
       --replace-fail "fixup_bundle" "#fixup_bundle"
   '';
@@ -89,28 +89,32 @@ stdenv'.mkDerivation (finalAttrs: {
       pkg-config
       rsync
     ]
-    ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]
-    ++ lib.optionals stdenv.isDarwin [ makeWrapper ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
-  buildInputs = [
-    capstone
-    curl
-    dbus
-    file
-    fmt
-    glfw3
-    gtk3
-    jansson
-    libGLU
-    mbedtls
-    nlohmann_json
-    yara
-  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers ];
+  buildInputs =
+    [
+      capstone
+      curl
+      dbus
+      file
+      fmt
+      glfw3
+      gtk3
+      jansson
+      libGLU
+      mbedtls
+      nlohmann_json
+      yara
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers
+    ];
 
   # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib
   # however, we will append to RUNPATH ourselves
-  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ "*.hexpluglib" ];
-  appendRunpaths = lib.optionals stdenv.isLinux [
+  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ "*.hexpluglib" ];
+  appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [
     (lib.makeLibraryPath [ libGL ])
     "${placeholder "out"}/lib/imhex/plugins"
   ];
@@ -118,7 +122,7 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "IMHEX_OFFLINE_BUILD" true)
     (lib.cmakeBool "IMHEX_COMPRESS_DEBUG_INFO" false) # avoids error: cannot compress debug sections (zstd not enabled)
-    (lib.cmakeBool "IMHEX_GENERATE_PACKAGE" stdenv.isDarwin)
+    (lib.cmakeBool "IMHEX_GENERATE_PACKAGE" stdenv.hostPlatform.isDarwin)
     (lib.cmakeBool "USE_SYSTEM_CAPSTONE" true)
     (lib.cmakeBool "USE_SYSTEM_CURL" true)
     (lib.cmakeBool "USE_SYSTEM_FMT" true)
@@ -129,12 +133,12 @@ stdenv'.mkDerivation (finalAttrs: {
 
   # rsync is used here so we can not copy the _schema.json files
   postInstall =
-    if stdenv.isLinux then
+    if stdenv.hostPlatform.isLinux then
       ''
         mkdir -p $out/share/imhex
         rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} $out/share/imhex
       ''
-    else if stdenv.isDarwin then
+    else if stdenv.hostPlatform.isDarwin then
       ''
         mkdir -p $out/Applications
         mv $out/imhex.app $out/Applications

pkgs/by-name/in/intelli-shell/package.nix

@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     sqlite
     zlib
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 

pkgs/by-name/in/invidious/package.nix

@@ -1,14 +1,15 @@
-{ lib
-, callPackage
-, crystal
-, fetchFromGitHub
-, librsvg
-, pkg-config
-, libxml2
-, openssl
-, shards
-, sqlite
-, nixosTests
+{
+  lib,
+  callPackage,
+  crystal,
+  fetchFromGitHub,
+  librsvg,
+  pkg-config,
+  libxml2,
+  openssl,
+  shards,
+  sqlite,
+  nixosTests,
 
   # All versions, revisions, and checksums are stored in ./versions.json.
   # The update process is the following:
@@ -19,7 +20,7 @@
   #     but nix's sandboxing does not allow that)
   #   * if shard.lock changed
   #     * recreate shards.nix by running crystal2nix
-, versions ? lib.importJSON ./versions.json
+  versions ? lib.importJSON ./versions.json,
 }:
 let
   # normally video.js is downloaded at build time
@@ -33,7 +34,7 @@ crystal.buildCrystalPackage rec {
     owner = "iv-org";
     repo = "invidious";
     fetchSubmodules = true;
-    rev = versions.invidious.rev or "v${version}";
+    rev = versions.invidious.rev or "refs/tags/v${version}";
     inherit (versions.invidious) hash;
   };
 
@@ -75,8 +76,15 @@ crystal.buildCrystalPackage rec {
           --replace-fail 'Process.run(%(rsvg-convert' 'Process.run(%(${lib.getBin librsvg}/bin/rsvg-convert'
     '';
 
-  nativeBuildInputs = [ pkg-config shards ];
-  buildInputs = [ libxml2 openssl sqlite ];
+  nativeBuildInputs = [
+    pkg-config
+    shards
+  ];
+  buildInputs = [
+    libxml2
+    openssl
+    sqlite
+  ];
 
   format = "crystal";
   shardsFile = ./shards.nix;
@@ -114,16 +122,18 @@ crystal.buildCrystalPackage rec {
   '';
 
   passthru = {
-    tests = { inherit (nixosTests) invidious; };
+    tests = {
+      inherit (nixosTests) invidious;
+    };
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open source alternative front-end to YouTube";
     mainProgram = "invidious";
     homepage = "https://invidious.io/";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       _999eagle
       GaetanLepage
       sbruder

pkgs/by-name/ju/jujutsu/package.nix

@@ -77,6 +77,14 @@ rustPlatform.buildRustPackage {
     "jj-cli"
   ];
 
+  checkFlags = [
+    # flaky test fixed upstream in 0.24+; the actual feature works reliably,
+    # it's just a false caching issue inside the test. skip it to allow the
+    # binary cache to be populated. https://github.com/martinvonz/jj/issues/4784
+    "--skip"
+    "test_shallow_commits_lack_parents"
+  ];
+
   env = {
     # Disable vendored libraries.
     ZSTD_SYS_USE_PKG_CONFIG = "1";

pkgs/by-name/ka/kando/package.nix

@@ -45,20 +45,20 @@ buildNpmPackage rec {
       zip
       makeWrapper
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       wayland-scanner
       copyDesktopItems
     ];
 
   buildInputs =
-    lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.hostPlatform.isLinux [
       libxkbcommon
       libX11
       libXtst
       libXi
       wayland
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
     ];
 
@@ -69,7 +69,7 @@ buildNpmPackage rec {
     # use our own node headers since we skip downloading them
     NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
     # disable code signing on Darwin
-    CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.isDarwin "false";
+    CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.hostPlatform.isDarwin "false";
   };
 
   postConfigure = ''
@@ -103,7 +103,7 @@ buildNpmPackage rec {
   installPhase = ''
     runHook preInstall
 
-    ${lib.optionalString stdenv.isLinux ''
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
       mkdir -p $out/share/kando
       cp -r out/*/{locales,resources{,.pak}} $out/share/kando
 
@@ -115,7 +115,7 @@ buildNpmPackage rec {
           --inherit-argv0
     ''}
 
-    ${lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
       cp -r out/*/Kando.app $out/Applications
       makeWrapper $out/Applications/Kando.app/Contents/MacOS/Kando $out/bin/kando

pkgs/by-name/ko/koboldcpp/package.nix

@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.77";
+  version = "1.78";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-dyu//4LRjpdxkyA9M5yNDO0DA7inZZjH4pSkj6l2afk=";
+    hash = "sha256-6RvodNWO/IVGlKxC/zt0itYDzymhk+hEBpbmQ1jHigU=";
   };
 
   enableParallelBuilding = true;

pkgs/by-name/kt/kty/package.nix

@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     [
       openssl
     ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk;
       [
         frameworks.SystemConfiguration

pkgs/by-name/ku/kubetui/package.nix

@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  buildInputs = lib.optionals (stdenv.isDarwin) (
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) (
     with darwin.apple_sdk;
     [
       frameworks.CoreGraphics

pkgs/by-name/la/LAStools/package.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "format"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-narrowing";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/li/libtorrent/package.nix

@@ -1,16 +1,17 @@
 # Note: this is rakshasa's version of libtorrent, used mainly by rtorrent.
 # *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc.
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoconf-archive
-, autoreconfHook
-, cppunit
-, libsigcxx
-, openssl
-, pkg-config
-, zlib
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
+  cppunit,
+  libsigcxx,
+  openssl,
+  pkg-config,
+  zlib,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  configureFlags = [ "--enable-aligned=yes" ];
+
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   enableParallelBuilding = true;
@@ -45,7 +48,11 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/rakshasa/libtorrent";
     description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
+    maintainers = with lib.maintainers; [
+      ebzzry
+      codyopel
+      thiagokokada
+    ];
     platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/li/lilv/package.nix

@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic))
   ] # Add nix and NixOS specific lv2 paths
     # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h
-    ++ lib.optional stdenv.isDarwin  (lib.mesonOption "default_lv2_path"
+    ++ lib.optional stdenv.hostPlatform.isDarwin  (lib.mesonOption "default_lv2_path"
       "~/.lv2:~/Library/Audio/Plug-Ins/LV2:"
       + "/usr/local/lib/lv2:/usr/lib/lv2:"
       + "/Library/Audio/Plug-Ins/LV2:"
       + "~/.nix-profile/lib/lv2")
-    ++ lib.optional stdenv.isLinux  (lib.mesonOption "default_lv2_path"
+    ++ lib.optional stdenv.hostPlatform.isLinux  (lib.mesonOption "default_lv2_path"
       "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:"
       + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2");
 

pkgs/by-name/ls/lsof/package.nix

@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   # Stop build scripts from searching global include paths
   LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include";
   configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB";
-    linuxFlags = lib.optionalString stdenv.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD";
-    freebsdFlags = lib.optionalString stdenv.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys";
+    linuxFlags = lib.optionalString stdenv.hostPlatform.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD";
+    freebsdFlags = lib.optionalString stdenv.hostPlatform.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys";
     in "${genericFlags} ${linuxFlags} ${freebsdFlags} ./Configure -n ${dialect}";
 
   preBuild = ''

pkgs/by-name/lu/luaformatter/package.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.isDarwin && stdenv.isx86_64
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
   ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
 
   meta = with lib; {

pkgs/by-name/lu/luckybackup/package.nix

@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     rsync
     openssh
+    qt5.qtwayland
   ];
 
   strictDeps = true;

pkgs/by-name/ma/matrix-authentication-service/package.nix

@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     npmHooks.npmConfigHook
     nodejs
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp
-  ] ++ lib.optional stdenv.isDarwin cctools; # libtool used by gyp;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp;
 
   buildInputs =
     [

pkgs/by-name/mi/misskey/package.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm.configHook
     makeWrapper
     python3
-  ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
 
   # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = pnpm.fetchDeps {

pkgs/by-name/mk/mkuimage/package.nix

@@ -35,7 +35,7 @@ buildGoModule {
   # Notice that due to some legacy/bug in buildGoModule, the build isn't
   # failing even the tests are, as we get a false-positive the output
   # filtering: https://github.com/NixOS/nixpkgs/issues/349468
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.hostPlatform.isLinux;
 
   # The tests want to copy /bin/bash and /bin/ls, but we don't have those.
   # As these are interesting e2e tests to check if things work, we substitute

pkgs/by-name/nc/nchat/package.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       sqlite
       zlib
     ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
         AppKit

pkgs/by-name/nc/ncmpcpp/package.nix

@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     ''
       ./autogen.sh
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # std::result_of was removed in c++20 and unusable for clang16
       substituteInPlace ./configure \
         --replace-fail "std=c++20" "std=c++17"

pkgs/by-name/ni/nix-serve/package.nix

@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.eelco ];
     license = licenses.lgpl21;
     # See https://github.com/edolstra/nix-serve/issues/57
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
     platforms = nix.meta.platforms;
     mainProgram = "nix-serve";
   };

pkgs/by-name/nu/numbat/package.nix

@@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec {
       atemu
     ];
     # Failing tests on Darwin.
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

pkgs/by-name/op/openvi/package.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     perl
-  ] ++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   makeFlags = [
     "PREFIX=$(out)"

pkgs/by-name/ot/otel-desktop-viewer/package.nix

@@ -27,7 +27,7 @@ buildGoModule rec {
 
   ldflags = [ "-s" "-w" ];
 
-  buildInputs = lib.optional stdenv.isDarwin apple-sdk_12;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12;
 
   passthru.tests.version = testers.testVersion {
     inherit version;

pkgs/by-name/ox/ox/package.nix

@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  testers,
+  nix-update-script,
+  ox,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";
@@ -13,6 +21,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
 
+  passthru = {
+    tests.version = testers.testVersion {
+      package = ox;
+    };
+
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Independent Rust text editor that runs in your terminal";
     homepage = "https://github.com/curlpipe/ox";

pkgs/by-name/pa/packetry/package.nix

@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
       gtk4
       pango
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
     ];
 

pkgs/by-name/pd/pdfarranger/package.nix

@@ -22,9 +22,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ gettext ];
+  nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     LINTL="${lib.getLib gettext}/lib/libintl.8.dylib"
     substituteInPlace pdfarranger/pdfarranger.py --replace-fail \
       "return 'libintl.8.dylib'" \

pkgs/by-name/pd/pdm/package.nix

@@ -22,6 +22,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM=";
   };
 
+  pythonRelaxDeps = [ "hishel" ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   build-system = with python3.pkgs; [

pkgs/by-name/ph/phlare/package.nix

@@ -1,6 +1,11 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
+{
+  lib,
+  buildGo122Module,
+  fetchFromGitHub,
+}:
+# breaks in go 1.23 with `invalid reference to runtime.aeskeysched`
+# won't be fixed upstream since the repository is archived.
+buildGo122Module rec {
   pname = "phlare";
   version = "0.6.1";
 
@@ -14,17 +19,20 @@ buildGoModule rec {
   proxyVendor = true;
   vendorHash = "sha256-l7+iDT9GAP9BX+xKvnx57iVF8wCM1YyHwq6dD9PbTDI=";
 
-  ldflags = let
-    prefix = "github.com/grafana/phlare/pkg/util/build";
-  in [
-    "-s" "-w"
-    # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
-    "-X ${prefix}.Version=${version}"
-    "-X ${prefix}.Branch=v${version}"
-    "-X ${prefix}.Revision=v${version}"
-    "-X ${prefix}.BuildUser=nix"
-    "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
-  ];
+  ldflags =
+    let
+      prefix = "github.com/grafana/phlare/pkg/util/build";
+    in
+    [
+      "-s"
+      "-w"
+      # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
+      "-X ${prefix}.Version=${version}"
+      "-X ${prefix}.Branch=v${version}"
+      "-X ${prefix}.Revision=v${version}"
+      "-X ${prefix}.BuildUser=nix"
+      "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
+    ];
 
   subPackages = [
     "cmd/phlare"

pkgs/by-name/po/positron-bin/package.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   inherit version pname;
 
   src =
-    if stdenv.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg";
         hash = "sha256-5Ym42InDgFLGdZk0LYV1H0eC5WzmsYToG1KLdiGgTto=";

pkgs/by-name/q2/q2pro/package.nix

@@ -21,8 +21,8 @@
   wayland-scanner,
   makeWrapper,
   versionCheckHook,
-  x11Support ? stdenv.isLinux,
-  waylandSupport ? stdenv.isLinux,
+  x11Support ? stdenv.hostPlatform.isLinux,
+  waylandSupport ? stdenv.hostPlatform.isLinux,
 }:
 
 stdenv.mkDerivation (finalAttrs: rec {
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     (lib.mesonBool "variable-fps" true)
     (lib.mesonEnable "wayland" waylandSupport)
     (lib.mesonEnable "x11" x11Support)
-    (lib.mesonEnable "icmp-errors" stdenv.isLinux)
+    (lib.mesonEnable "icmp-errors" stdenv.hostPlatform.isLinux)
     (lib.mesonEnable "windows-crash-dumps" false)
   ];
 

pkgs/by-name/ra/rainfrog/package.nix

@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-L0gXxV/3+5oRV/Ipm4sRqr9dh9AEChWhtILO3PaNxYY=";
 
-  buildInputs = lib.optionals stdenv.isDarwin (
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
     [
       AppKit

pkgs/by-name/rm/rmapi/package.nix

@@ -2,23 +2,23 @@
 
 buildGoModule rec {
   pname = "rmapi";
-  version = "0.0.25";
+  version = "0.0.27.1";
 
   src = fetchFromGitHub {
-    owner = "juruen";
+    owner = "ddvk";
     repo = "rmapi";
     rev = "v${version}";
-    sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY=";
+    sha256 = "sha256-nwGTBCzA9+J3S3Gd3YgwCWAj/gMcoS19awluDZWZCbU=";
   };
 
-  vendorHash = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg=";
+  vendorHash = "sha256-5m3/XFyBEWM8UB3WylkBj+QWI5XsnlVD4K3BhKVVCB4=";
 
   doCheck = false;
 
   meta = with lib; {
     description = "Go app that allows access to the ReMarkable Cloud API programmatically";
-    homepage = "https://github.com/juruen/rmapi";
-    changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/ddvk/rmapi";
+    changelog = "https://github.com/ddvk/rmapi/blob/v${version}/CHANGELOG.md";
     license = licenses.agpl3Only;
     maintainers = [ maintainers.nickhu ];
     mainProgram = "rmapi";

pkgs/by-name/rq/rqbit/package.nix

@@ -47,13 +47,13 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI=";
 
-  nativeBuildInputs = lib.optionals stdenv.isLinux [
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config
   ];
 
   buildInputs =
-    lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
+    lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
 
   preConfigure = ''
     mkdir -p crates/librqbit/webui/dist

pkgs/by-name/ru/rustdesk-flutter/package.nix

@@ -163,8 +163,11 @@ flutter319.buildFlutterApplication rec {
   patches = [ ./make-build-reproducible.patch ];
 
   postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    if [ $cargoDepsCopy ]; then # That will be inherited to buildDartPackage and it doesn't have cargoDepsCopy
+      substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+        --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    fi
+
     substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" ""
     # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version
     cp ${./Cargo.lock} ../Cargo.lock

pkgs/by-name/sa/sasquatch/package.nix

@@ -23,7 +23,7 @@ let
       hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU=";
     };
 
-    patches = lib.optional stdenv.isDarwin ./darwin.patch;
+    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
 
     strictDeps = true;
     nativeBuildInputs = [ which ];

pkgs/by-name/sc/scopehal-apps/package.nix

@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       shaderc
       spirv-tools
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       wrapGAppsHook4
     ];
 
@@ -66,13 +66,13 @@ stdenv.mkDerivation {
       yaml-cpp
       zstd
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       ffts
       gtkmm3
       libtirpc
     ]
     ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
       (darwinMinVersionHook "10.15")
       moltenvk
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
       --replace-fail '"/share/' '"/../share/'
   '';
 
-  cmakeFlags = lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"
   ];
 

pkgs/by-name/si/sioyek/package.nix

@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postInstall =
-    if stdenv.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
       ''
         cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders
         cp pdf_viewer/{prefs,prefs_user,keys,key_user}.config tutorial.pdf sioyek.app/Contents/MacOS/

pkgs/by-name/sn/snakemake/package.nix

@@ -121,7 +121,7 @@ python3Packages.buildPythonApplication rec {
       "test_output_file_cache_storage"
       "test_storage"
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Unclear failure:
       # AssertionError: expected successful execution
       # `__darwinAllowLocalNetworking` doesn't help

pkgs/by-name/sq/sql-studio/package.nix

@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.frectonz ];
     platforms = lib.platforms.all;
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

pkgs/by-name/sq/sqruff/package.nix

@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     rust-jemalloc-sys
-  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
 
   # Patch the tests to find the binary
   postPatch = ''

pkgs/by-name/st/styluslabs-write/package.nix

@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
       atemu
     ];
     platforms = with lib.platforms; linux ++ darwin ++ windows;
-    broken = !stdenv.isLinux;
+    broken = !stdenv.hostPlatform.isLinux;
     mainProgram = "Write";
   };
 })

pkgs/by-name/sw/swim/package.nix

@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     [
       openssl
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.SystemConfiguration
     ];

pkgs/by-name/te/termscp/package.nix

@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
       "--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir"
       "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir"
     ]
-    ++ lib.optionals stdenvNoCC.isDarwin [
+    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
       "--skip=system::watcher::test::should_poll_file_removed"
       "--skip=system::watcher::test::should_poll_file_update"
     ];

pkgs/by-name/ve/veryl/package.nix

@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     [
       dbus
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.CoreFoundation
       darwin.apple_sdk.frameworks.CoreServices
       darwin.apple_sdk.frameworks.Security

pkgs/by-name/wr/wrangler/package.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       llvmPackages.libcxx
       llvmPackages.libunwind
     ]
-    ++ lib.optionals (stdenv.isLinux) [
+    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       musl # not used, but requires extra work to remove
       xorg.libX11 # for the clipboardy package
     ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
       nodejs
       pnpm_9.configHook
     ]
-    ++ lib.optionals (stdenv.isLinux) [
+    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       autoPatchelfHook
     ];
 

pkgs/by-name/x4/x4/package.nix

@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
       openssl
       zlib
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
     ];
 

pkgs/by-name/zv/zvbi/package.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
   ];
 
-  buildInputs = lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   outputs = [
     "out"

pkgs/development/compilers/elm/packages/node/node-composition.nix

@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../../node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

pkgs/development/compilers/smlnj/default.nix

@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
   patchPhase = ''
     sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
     echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
-  '' + lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Locate standard headers like <unistd.h>
     substituteInPlace base/runtime/config/gen-posix-names.sh \
       --replace "\$SDK_PATH/usr" "${Libsystem}"

pkgs/development/compilers/swift/swiftpm/default.nix

@@ -356,7 +356,7 @@ let
       swift-driver
       swift-system
       swift-tools-support-core
-    ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
+    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
     cmakeFlags = [
       "-DUSE_CMAKE_INSTALL=ON"
@@ -386,7 +386,7 @@ in stdenv.mkDerivation (commonAttrs // {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       CryptoKit
       LocalAuthentication
-  ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
   configurePhase = generated.configure + ''
     # Functionality provided by Xcode XCTest, but not available in

pkgs/development/interpreters/gauche/boot.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       mbedtls
       cacert
     ]
-    ++ lib.optionals (stdenv.isDarwin) [
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       darwin.apple_sdk_11_0.frameworks.CoreServices
     ];
 

pkgs/development/libraries/capstone/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-  ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
 
   nativeBuildInputs = [
     cmake

pkgs/development/libraries/librasterlite2/default.nix

@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     proj
     sqlite
     zstd
-  ] ++ lib.optional stdenv.isDarwin ApplicationServices;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices;
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/physics/geant4/default.nix

@@ -4,7 +4,7 @@
 , enableQt             ? enableQT
 , enableXM             ? false
 , libGLX
-, enableOpenGLX11      ? !stdenv.isDarwin
+, enableOpenGLX11      ? !stdenv.hostPlatform.isDarwin
 , enablePython         ? false
 , enableRaytracerX11   ? false
 

pkgs/development/libraries/qt-5/modules/qtbase.nix

@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: ({
       lib.optional withLibinput libinput
       ++ lib.optional withGtk3 gtk3
     )
-    ++ lib.optional stdenv.isDarwin darwinVersionInputs
+    ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysqlSupport) libmysqlclient

pkgs/development/libraries/qt-5/qtModule.nix

@@ -28,7 +28,7 @@ mkDerivation (args // {
   buildInputs =
     args.buildInputs or [ ]
     # Per https://doc.qt.io/qt-5/macos.html#supported-versions
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_13
       (darwinMinVersionHook "10.13")
     ];

pkgs/development/libraries/unicorn/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       cmake
       pkg-config
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
     ];
 

pkgs/development/lua-modules/overrides.nix

@@ -561,7 +561,7 @@ in
   });
 
   neotest  = prev.neotest.overrideAttrs(oa: {
-    doCheck = stdenv.isLinux;
+    doCheck = stdenv.hostPlatform.isLinux;
     nativeCheckInputs = oa.nativeCheckInputs ++ [
       final.nlua final.busted neovim-unwrapped
     ];

pkgs/development/php-packages/phpstan/default.nix

@@ -11,11 +11,11 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
     hash = "sha256-wF2OqJ0kg+wEjSq8mAyF5em5RAqjyXqKFkdAjxOrePM=";
   };
 
-  vendorHash = "sha256-NLaOxWMhTViv7OfXE5b7NTeL/jD7Fvbx/1ihGlRJCws=";
+  vendorHash = "sha256-IHnPhV4H8xkonjllOGMmB0zibaGapc8XBrg4km/jKb4=";
   composerStrictValidation = false;
 
   meta = {

pkgs/development/python-modules/aiosql/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiosql";
-  version = "12.2";
+  version = "13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "nackjicholson";
     repo = "aiosql";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ouk1bzoczkUeYG0JKOgleLuyu9ll2y17AN7gsUI3SRo=";
+    hash = "sha256-WvYCMImLrQjaTrMgDrkF1fOUv/pxbwFHT+SwOZkTMl0=";
   };
 
   sphinxRoot = "docs/source";

pkgs/development/python-modules/arviz/default.nix

@@ -101,7 +101,7 @@ buildPythonPackage rec {
   ];
 
   # Tests segfault on darwin
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   pythonImportsCheck = [ "arviz" ];
 

pkgs/development/python-modules/berkeleydb/default.nix

@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   # Every test currently fails with:
   # berkeleydb.db.DBRunRecoveryError: (-30973, 'BDB0087 DB_RUNRECOVERY: Fatal error, run database recovery -- BDB1546 unable to join the environment')
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   checkPhase = ''
     ${python.interpreter} test.py