Merge master into staging-next

nixos/modules/installer/tools/nix-fallback-paths.nix

@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/hdy82qidsybc3fg561pqfwagv44vschb-nix-2.24.10";
+  x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11";
-  i686-linux = "/nix/store/dyx4p79q6blva585bf90wbjjb7iyq8ra-nix-2.24.10";
+  i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11";
-  aarch64-linux = "/nix/store/30gnc15nig1awa11vii9yz3z8518rnr3-nix-2.24.10";
+  aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11";
-  riscv64-linux = "/nix/store/bxc2pyp1vj8kr77khyx5nglw73jqb98w-nix-riscv64-unknown-linux-gnu-2.24.10";
+  riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11";
-  x86_64-darwin = "/nix/store/6mrkghigrci6dz2lnncqpgf80yi8gl7h-nix-2.24.10";
+  x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11";
-  aarch64-darwin = "/nix/store/3f81gjiv836rjmsb29zab0pbjwf9did8-nix-2.24.10";
+  aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11";
 }

nixos/modules/misc/label.nix

@@ -48,7 +48,7 @@ in
         Strings to prefix to the default
         {option}`system.nixos.label`.
 
-        Useful for not loosing track of configurations built with
+        Useful for not losing track of configurations built with
         different options, e.g.:
 
         ```

nixos/modules/programs/less.nix

@@ -101,8 +101,8 @@ in
 
       lessopen = lib.mkOption {
         type = lib.types.nullOr lib.types.str;
-        default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
+        default = null;
-        defaultText = lib.literalExpression ''"|''${pkgs.lesspipe}/bin/lesspipe.sh %s"'';
+        example = lib.literalExpression ''"|''${pkgs.lesspipe}/bin/lesspipe.sh %s"'';
         description = ''
           Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed.
         '';

pkgs/by-name/er/erofs-utils/package.nix

@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "erofs-utils";
-  version = "1.8.2";
+  version = "1.8.3";
   outputs = [
     "out"
     "man"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ZLb/fomfYkgCg87mN4fzfw+cS+emvHoj1zSqqHOmz/Q=";
+    hash = "sha256-PFzANgPqCLqa5eBCDurqX/F+0p4igGhTEDVsvyUwToU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ff/ffpb/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "ffpb";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7eVqbLpMHS1sBw2vYS4cTtyVdnnknGtEI8190VlXflk=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.tqdm ];
+
+  # tests require working internet connection
+  doCheck = false;
+
+  meta = {
+    description = "FFmpeg progress formatter to display a nice progress bar and an adaptative ETA timer";
+    homepage = "https://github.com/althonos/ffpb";
+    changelog = "https://github.com/althonos/ffpb/blob/master/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ CaptainJawZ ];
+    mainProgram = "ffpb";
+  };
+}

pkgs/by-name/go/google-chrome/package.nix

@@ -166,11 +166,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "131.0.6778.108";
+    version = "131.0.6778.139";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-DU9qaMnn7gM/8VR4lsetWlkYu/Gs5+i/9JPYY2sbCi0=";
+      hash = "sha256-JEJnOawnz6BIXm+pbjz0u1BQOUwm+2hBCMh5NnN2aII=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "131.0.6778.109";
+    version = "131.0.6778.140";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adhpt2otqvd2vrh5vbgwgtydt7gq_131.0.6778.109/GoogleChrome-131.0.6778.109.dmg";
+      url = "http://dl.google.com/release2/chrome/ijobeyqsjtnv35wplq3dh5ngae_131.0.6778.140/GoogleChrome-131.0.6778.140.dmg";
-      hash = "sha256-9pKGJa7UiDx1QPnWk0ONDQukUdRAPGz1PeYd7UoReoQ=";
+      hash = "sha256-LK5OSVxPtqgKMvg+AS2Q36RLBT8C3XRuPelCWTogXgY=";
     };
 
     dontPatch = true;

pkgs/by-name/js/jsonld-cli/package.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "jsonld-cli";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "digitalbazaar";
+    repo = "jsonld-cli";
+    rev = "v${version}";
+    hash = "sha256-GandTCcRYd0c0SlSdsCAcaTKfwD4g1cwHuoxA62aD74=";
+  };
+
+  postPatch = "cp ${./package-lock.json} package-lock.json";
+  npmDepsHash = "sha256-6oQKHeX5P2UsXRFK7ZwmJYasuNT5Ch/bYCIUAXq5zUM=";
+  dontNpmBuild = true;
+
+  meta = {
+    description = "JSON-LD command line interface tool";
+    homepage = "https://github.com/digitalbazaar/jsonld-cli";
+    changelog = "https://github.com/digitalbazaar/jsonld-cli/blob/main/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ msladecek ];
+    mainProgram = "jsonld";
+  };
+}

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

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmediainfo";
-  version = "24.11";
+  version = "24.12";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    hash = "sha256-luRKYX+QyLY7toWtU75nFrffQiF5PDKXgPAq6m5weqE=";
+    hash = "sha256-H0mGIH913rKQkV5r8LM+PkVXdDBd0mb/6Jl8AarWWyc=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/by-name/me/mediainfo/package.nix

@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mediainfo";
-  version = "24.11.1";
+  version = "24.12";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    hash = "sha256-FRBD/o1xmfEjBv3bwwtYoSlueaATrDgaKlfmO9YLy9E=";
+    hash = "sha256-NpmuZQznGJOpMs4uqio1+NpH5vch+T1pWwvrCq1OmZc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mf/mfcl5750dw/fix-perm.patch

@@ -0,0 +1,10 @@
+--- a/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper	2020-01-29 08:26:18.000000000 +0100
++++ b/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper	2023-12-29 14:12:44.522567053 +0100
+@@ -383,6 +383,7 @@
+ close $temprch;
+ 
+ `cp  $basedir/inf/br${PRINTER}rc  $TEMPRC`;
++`chmod 666 $TEMPRC`;
+ $ENV{BRPRINTERRCFILE} = $TEMPRC;
+ 
+ logprint( 0 , "TEMPRC    = $TEMPRC\n");

pkgs/by-name/mf/mfcl5750dw/package.nix

@@ -0,0 +1,120 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  dpkg,
+  autoPatchelfHook,
+  makeWrapper,
+  perl,
+  gnused,
+  ghostscript,
+  file,
+  coreutils,
+  gnugrep,
+  which,
+}:
+
+let
+  arches = [
+    "x86_64"
+    "i686"
+    "armv7l"
+  ];
+
+  runtimeDeps = [
+    ghostscript
+    file
+    gnused
+    gnugrep
+    coreutils
+    which
+  ];
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "mfcl5750dw";
+  version = "3.5.1-1";
+
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+    autoPatchelfHook
+  ];
+  buildInputs = [ perl ];
+
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf102614/mfcl5750dwcupswrapper-${finalAttrs.version}.i386.deb";
+    sha256 = "afe6d18e17d26348f3b8a4f9a003107984940c429a7dd193054303a21f5e65b5";
+  };
+
+  lpr_src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf102613/mfcl5750dwlpr-${finalAttrs.version}.i386.deb";
+    sha256 = "b1b9c1f9ae8522a65fdd2db1e760aed835807ba593d001ac5471635a157cd1f1";
+  };
+
+  unpackPhase = ''
+    dpkg-deb -x $src .
+    dpkg-deb -x $lpr_src .
+  '';
+
+  patches = [
+    # The brother lpdwrapper uses a temporary file to convey the printer settings.
+    # The original settings file will be copied with "400" permissions and the "brprintconflsr3"
+    # binary cannot alter the temporary file later on. This fixes the permissions so the can be modified.
+    # Since this is all in briefly in the temporary directory of systemd-cups and not accessible by others,
+    # it shouldn't be a security concern.
+    ./fix-perm.patch
+  ];
+
+  installPhase =
+    ''
+      runHook preInstall
+      mkdir -p $out
+      cp -ar opt $out/opt
+
+      # delete unnecessary files for the current architecture
+    ''
+    + lib.concatMapStrings (arch: ''
+      echo Deleting files for ${arch}
+      rm -r "$out/opt/brother/Printers/MFCL5750DW/lpd/${arch}"
+    '') (builtins.filter (arch: arch != stdenvNoCC.hostPlatform.linuxArch) arches)
+    + ''
+      # bundled scripts don't understand the arch subdirectories for some reason
+      ln -s \
+        "$out/opt/brother/Printers/MFCL5750DW/lpd/${stdenvNoCC.hostPlatform.linuxArch}/"* \
+        "$out/opt/brother/Printers/MFCL5750DW/lpd/"
+
+      # Fix global references and replace auto discovery mechanism with hardcoded values
+      substituteInPlace $out/opt/brother/Printers/MFCL5750DW/lpd/lpdfilter \
+        --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL5750DW\"; #" \
+        --replace "PRINTER =~" "PRINTER = \"MFCL5750DW\"; #"
+
+      substituteInPlace $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
+      --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/MFCL5750DW\" ; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL5750DW\"; #"
+
+      # Make sure all executables have the necessary runtime dependencies available
+      find "$out" -executable -and -type f | while read file; do
+        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+      done
+      # Symlink filter and ppd into a location where CUPS will discover it
+      mkdir -p $out/lib/cups/filter
+      mkdir -p $out/share/cups/model
+      mkdir -p $out/etc/opt/brother/Printers/MFCL5750DW/inf
+      ln -s $out/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc \
+      $out/etc/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc
+      ln -s \
+      $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
+      $out/lib/cups/filter/brother_lpdwrapper_MFCL5750DW
+      ln -s \
+      $out/opt/brother/Printers/MFCL5750DW/cupswrapper/brother-MFCL5750DW-cups-en.ppd \
+      $out/share/cups/model/
+      runHook postInstall
+    '';
+  meta = {
+    homepage = "https://www.brother.com/";
+    description = "Brother MFCL5750DW CUPS driver";
+    license = lib.licenses.unfree;
+    platforms = builtins.map (arch: "${arch}-linux") arches;
+    maintainers = with lib.maintainers; [ qdlmcfresh ];
+  };
+})

pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix

@@ -37,11 +37,14 @@ stdenv.mkDerivation rec {
     ./support-ppp-2.5.0.patch
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     gettext
     pkg-config
     file
+    glib
   ];
 
   buildInputs = [

pkgs/by-name/ne/networkmanager-iodine/package.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation {
     intltool
     autoreconfHook
     pkg-config
+    glib
   ];
 
   buildInputs =

pkgs/by-name/ne/nextcloud-talk-desktop/package.nix

@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  nss,
+  cairo,
+  xorg,
+  libxkbcommon,
+  alsa-lib,
+  at-spi2-core,
+  mesa,
+  pango,
+  libdrm,
+  vivaldi-ffmpeg-codecs,
+  gtk3,
+  libGL,
+  libglvnd,
+  systemd,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nextcloud-talk-desktop";
+  version = "1.0.0";
+
+  # Building from source would require building also building Server and Talk components
+  # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
+  src = fetchzip {
+    url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
+    hash = "sha256-XQa4Fa9eEaFlYrWa00S9aMWKJOPPFGSo4NAlRqE23jM=";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs =
+    [
+      nss
+      cairo
+      alsa-lib
+      at-spi2-core
+      pango
+      libdrm
+      libxkbcommon
+      gtk3
+      vivaldi-ffmpeg-codecs
+      mesa
+      libGL
+      libglvnd
+    ]
+    ++ (with xorg; [
+      libX11
+      libXcomposite
+      libXdamage
+      libXrandr
+      libXfixes
+      libXcursor
+    ]);
+
+  # Required to launch the application and proceed past the zygote_linux fork() process
+  # Fixes `Zygote could not fork`
+  runtimeDependencies = [ systemd ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/opt
+
+    cp -r $src/* $out/opt/
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Link the application in $out/bin away from contents of `preInstall`
+    ln -s "$out/opt/Nextcloud Talk-linux-x64/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Nextcloud Talk Desktop Client";
+    homepage = "https://github.com/nextcloud/talk-desktop";
+    changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ kashw2 ];
+    mainProgram = "nextcloud-talk-desktop";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

pkgs/by-name/ni/nixos-install/nixos-install.sh

@@ -246,6 +246,8 @@ if [[ -z $noBootLoader ]]; then
     export mountPoint
     NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF'
       set -e
+      # Clear the cache for executable locations. They were invalidated by the chroot.
+      hash -r
       # Create a bind mount for each of the mount points inside the target file
       # system. This preserves the validity of their absolute paths after changing
       # the root with `nixos-enter`.

pkgs/by-name/ni/nixos-install/package.nix

@@ -7,6 +7,7 @@
   jq,
   nixos-enter,
   util-linuxMinimal,
+  nixosTests,
 }:
 substituteAll {
   name = "nixos-install";
@@ -29,6 +30,8 @@ substituteAll {
     installManPage ${./nixos-install.8}
   '';
 
+  passthru.tests.installer-simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot;
+
   meta = {
     description = "Install bootloader and NixOS";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";

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

@@ -39,7 +39,9 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ]
   ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-  ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd";
+  ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"
+  # configure: error: cannot check for file existence when cross compiling
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc";
 
   enableParallelBuilding = true;
 

pkgs/by-name/sm/smc-manjari/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitLab,
+  python3Packages,
+  gnumake,
+  truetype ? false,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "smc-manjari";
+  version = "2.200";
+
+  src = fetchFromGitLab {
+    group = "smc";
+    owner = "fonts";
+    repo = "manjari";
+    rev = "Version${version}";
+    hash = "sha256-B3EI6rrZyhc3xJuVIDVIjLrjJmFoFzHIwVV/4EBQv1s=";
+  };
+
+  nativeBuildInputs = [
+    gnumake
+    python3Packages.fontmake
+  ];
+
+  buildFlags = [ "otf" ] ++ lib.optional truetype "ttf";
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 -t $out/share/fonts/opentype build/*.otf
+    ${lib.optionalString truetype "install -Dm444 -t $out/share/fonts/truetype build/*.ttf"}
+
+    install -Dm644 -t $out/etc/fonts/conf.d *.conf
+
+    install -Dm644 -t $out/share/doc/${pname}-${version} OFL.txt FONTLOG.md
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://smc.org.in/fonts/manjari";
+    description = "Manjari Malayalam Typeface";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ adtya ];
+  };
+}

pkgs/by-name/st/stackit-cli/package.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.17.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-oDy/imlRoMS1kVHlMSCHaurNJX5eSs6W2sj14ZpsF8k=";
+    hash = "sha256-gqNWdZUQHT7Oa222+cbFgbmTBeg9nM/ot0WSVSCzMn8=";
   };
 
-  vendorHash = "sha256-EWDtVs9H7e+HSyO1ZzCV5T+pGporQhRNlI9VkXc6j1E=";
+  vendorHash = "sha256-f7SkRCe8AknhCCJ79iKqC4BeSW/jM33LdA6HTQpa+3o=";
 
   subPackages = [ "." ];
 

pkgs/development/libraries/gnutls/default.nix

@@ -120,6 +120,8 @@ stdenv.mkDerivation rec {
       "--enable-ktls"
     ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
       "--disable-doc"
+    ] ++ lib.optionals (stdenv.hostPlatform.isLinux && tpmSupport) [
+      "--with-trousers-lib=${trousers}/lib/libtspi.so"
     ];
 
   enableParallelBuilding = true;

pkgs/development/libraries/science/astronomy/indilib/default.nix

@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "indilib";
-  version = "2.0.9";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CV8nSz53wFeS/h7hGj9adN8qmyhsqOkTYj/0nuvhlSM=";
+    hash = "sha256-S9FXa+yBA4IYPOiiFkLUNdEFZPraVV5vjtgwDQ/FbNY=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix

@@ -45,7 +45,7 @@ let
     owner = "indilib";
     repo = "indi-3rdparty";
     rev = "v${indilib.version}";
-    hash = "sha256-RhtdhMvseQUUFcKDuR1N5qc/86IxmQ/7owpjT+qweqc=";
+    hash = "sha256-J9WPoaULH6UXL1q1O76+IDW97ydQWkHIID6n7wvOdE4=";
   };
 
   buildIndi3rdParty =
@@ -363,8 +363,8 @@ let
     pname = "libqhy";
 
     postPatch = ''
-      substituteInPlace --replace-fail CMakeLists.txt \
+      substituteInPlace CMakeLists.txt \
-        --replace "/lib/firmware" "lib/firmware"
+        --replace-fail "/lib/firmware" "lib/firmware"
 
       substituteInPlace 85-qhyccd.rules \
         --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \
@@ -506,6 +506,7 @@ in
       libapogee
       zlib
     ];
+    propagatedBuildInputs = [ libapogee ];
     meta.platforms = libapogee.meta.platforms;
   };
 
@@ -529,6 +530,7 @@ in
       libusb1
       zlib
     ];
+    propagatedBuildInputs = [ libasi ];
     meta.platforms = libasi.meta.platforms;
   };
 
@@ -540,6 +542,11 @@ in
     meta.broken = true;
   };
 
+  indi-astarbox = buildIndi3rdParty {
+    pname = "indi-astarbox";
+    buildInputs = [ indilib ];
+  };
+
   indi-astroasis = buildIndi3rdParty {
     pname = "indi-astroasis";
     buildInputs = [
@@ -549,22 +556,10 @@ in
       libusb1
       zlib
     ];
+    propagatedBuildInputs = [ libastroasis ];
     meta.platforms = libastroasis.meta.platforms;
   };
 
-  indi-astrolink4 = buildIndi3rdParty {
-    pname = "indi-astrolink4";
-    buildInputs = [ indilib ];
-  };
-
-  indi-astromechfoc = buildIndi3rdParty {
-    pname = "indi-astromechfoc";
-    buildInputs = [
-      indilib
-      zlib
-    ];
-  };
-
   indi-atik = buildIndi3rdParty {
     pname = "indi-atik";
     buildInputs = [
@@ -620,11 +615,6 @@ in
     ];
   };
 
-  indi-dreamfocuser = buildIndi3rdParty {
-    pname = "indi-dreamfocuser";
-    buildInputs = [ indilib ];
-  };
-
   indi-dsi = buildIndi3rdParty {
     pname = "indi-dsi";
     buildInputs = [
@@ -978,15 +968,6 @@ in
     buildInputs = [ indilib ];
   };
 
-  indi-spectracyber = buildIndi3rdParty {
-    pname = "indi-spectracyber";
-    buildInputs = [
-      indilib
-      libnova
-      zlib
-    ];
-  };
-
   indi-starbook = buildIndi3rdParty {
     pname = "indi-starbook";
     buildInputs = [

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

@@ -5,7 +5,7 @@
   pythonOlder,
 
   # build-system
-  setuptools,
+  hatchling,
 
   # dependencies
   aiohttp,
@@ -17,19 +17,19 @@
 
 buildPythonPackage rec {
   pname = "openwebifpy";
-  version = "4.2.7";
+  version = "4.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MoTSfoO6km3jAaF9oIDxhxhMI8jqZAyPD6yBYcYxhd4=";
+    hash = "sha256-fsGHTmi+dWP0SBPvF51RdL2zBMHtjry/XTGjyU5jKpI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     yarl
   ];

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

@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "prosemirror";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI=";
+    hash = "sha256-COjCU//frJf2MNgaAz5aQizbjRsF3ypYFXS6aDjqrIU=";
   };
 
   build-system = [ setuptools-scm ];

pkgs/development/python-modules/socid-extractor/default.nix

@@ -5,35 +5,32 @@
   fetchFromGitHub,
   python-dateutil,
   pythonOlder,
+  setuptools,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "socid-extractor";
-  version = "0.0.26";
+  version = "0.0.27";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "soxoj";
-    repo = pname;
+    repo = "socid-extractor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
-    hash = "sha256-3ht/wlxB40k4n0DTBGAvAl7yPiUIZqAe+ECbtkyMTzk=";
+    hash = "sha256-oiXIxNvedEk+EufYzxhvRr8m+kuQRs0J62Yel5JLenQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     beautifulsoup4
     python-dateutil
     requests
   ];
 
-  postPatch = ''
-    # https://github.com/soxoj/socid-extractor/pull/150
-    substituteInPlace requirements.txt \
-      --replace "beautifulsoup4~=4.11.1" "beautifulsoup4>=4.10.0"
-  '';
-
   # Test require network access
   doCheck = false;
 
@@ -41,10 +38,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to extract details from personal pages";
-    mainProgram = "socid_extractor";
     homepage = "https://github.com/soxoj/socid-extractor";
     changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ gpl3Only ];
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "socid_extractor";
   };
 }

pkgs/development/python-modules/ttfautohint-py/default.nix

@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -24,7 +25,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace src/python/ttfautohint/__init__.py \
-      --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint.so"'
+      --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';
 
   env.TTFAUTOHINTPY_BUNDLE_DLL = false;

pkgs/kde/third-party/koi/default.nix

@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "koi";
-  version = "0.3.1";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "baduhai";
     repo = "Koi";
     rev = version;
-    sha256 = "sha256-dhpuKIY/Xi62hzJlnVCIOF0k6uoQ3zH129fLq/r+Kmg";
+    sha256 = "sha256-ip7e/Sz/l5UiTFUTLJPorPO7NltE2Isij2MCmvHZV40=";
   };
 
   # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -4,31 +4,31 @@
         "hash": "sha256:0ypnbp5k2xkfwk4xp5sfsgb3v29cjx278wwaa2csqpnki91hyhgp"
     },
     "6.1": {
-        "version": "6.1.119",
+        "version": "6.1.120",
-        "hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf"
+        "hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1"
     },
     "5.15": {
-        "version": "5.15.173",
+        "version": "5.15.174",
-        "hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa"
+        "hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3"
     },
     "5.10": {
-        "version": "5.10.230",
+        "version": "5.10.231",
-        "hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d"
+        "hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn"
     },
     "5.4": {
-        "version": "5.4.286",
+        "version": "5.4.287",
-        "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq"
+        "hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd"
     },
     "6.6": {
-        "version": "6.6.64",
+        "version": "6.6.66",
-        "hash": "sha256:1cbag4wzv5fpjdcl0rpp158ch1q17rfz2qxm1xjjyhnblqzxjpq6"
+        "hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx"
     },
     "6.11": {
         "version": "6.11.11",
         "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
     },
     "6.12": {
-        "version": "6.12.4",
+        "version": "6.12.5",
-        "hash": "sha256:0lhisw9sy0b38j1nifcgjm8w9864qx3hg6b7f6z2311x8chzhdbg"
+        "hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r"
     }
 }

pkgs/servers/sql/postgresql/ext/pg_net.nix

@@ -9,7 +9,7 @@
 
 buildPostgresqlExtension rec {
   pname = "pg_net";
-  version = "0.13.0";
+  version = "0.14.0";
 
   buildInputs = [ curl ];
 
@@ -17,7 +17,7 @@ buildPostgresqlExtension rec {
     owner = "supabase";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-FRaTZPCJQPYAFmsJg22hYJJ0+gH1tMdDQoCQgiqEnaA=";
+    hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";

pkgs/tools/package-management/nix/default.nix

@@ -173,14 +173,14 @@ in lib.makeExtensible (self: ({
   };
 
   nix_2_24 = common {
-    version = "2.24.10";
+    version = "2.24.11";
-    hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";
+    hash = "sha256-ZizmbJM+DbhkaizxbjKg9fNfMrxh3PfAZ6jApQrazks=";
     self_attribute_name = "nix_2_24";
   };
 
   nix_2_25 = common {
-    version = "2.25.2";
+    version = "2.25.3";
-    hash = "sha256-MZNpb4awWHXU+kGmH58VUB7M9l6UVo33riuQLTbMh4E=";
+    hash = "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=";
     self_attribute_name = "nix_2_25";
   };