Merge master into staging-next

doc/languages-frameworks/octave.section.md

@@ -3,7 +3,7 @@
 ## Introduction {#ssec-octave-introduction}
 
 Octave is a modular scientific programming language and environment.
-A majority of the packages supported by Octave from their [website](https://octave.sourceforge.io/packages.php) are packaged in nixpkgs.
+A majority of the packages supported by Octave from their [website](https://gnu-octave.github.io/packages/) are packaged in nixpkgs.
 
 ## Structure {#ssec-octave-structure}
 

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

@@ -607,6 +607,10 @@
 
 - `programs.fzf.keybindings` now supports the fish shell.
 
+- `gerbera` now has wavpack support.
+
+- `octave` (and `octaveFull`) was updated to version `10.x`. The update broke a few `octavePackages`, and `librsb`. See [the PR's commits](https://github.com/NixOS/nixpkgs/pull/394495/commits) for more details.
+
 - A toggle has been added under `users.users.<name>.enable` to allow toggling individual users conditionally. If set to false, the user account will not be created.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/by-name/br/breakpointHook/attach.sh

@@ -56,6 +56,10 @@ elif [ "$(echo "$pids" | wc -l)" -ne 1 ]; then
 fi
 pid="$(echo "$pids" | head -n1)"
 
+
+# get the build top level directory inside the sandbox (eg. /build)
+buildDir=$(getVar NIX_BUILD_TOP)
+
 # bash is needed to load the env vars, as we do not know the syntax of the debug shell.
 # bashInteractive is used instead of bash, as we depend on it anyways, due to it being
 #   the default debug shell
@@ -71,11 +75,11 @@ pwd="$(readlink /proc/$pid/cwd)"
 # If another shell is chosen via `debugShell`, it will only have simple env vars avaialable.
 exec nsenter --mount --ipc --uts --pid  --net --target "$pid" "$bashInteractive" -c "
   set -eu -o pipefail
-  source /build/env-vars
+  source \"$buildDir/env-vars\"
   cd \"$pwd\"
   if [ -n \"$debugShell\" ]; then
     exec \"$debugShell\"
   else
-    exec \"$bashInteractive\" --init-file /build/env-vars
+    exec \"$bashInteractive\" --init-file \"$buildDir/env-vars\"
   fi
 "

pkgs/by-name/lp/LPCNet/package.nix

@@ -7,6 +7,7 @@
   codec2,
   # for tests
   octave,
+  sox,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,9 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "LPCNet";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0=";
   };
+
   passthru = {
     # Prebuilt neural network model that is needed during the build - can be overwritten
     nnmodel = fetchurl {
@@ -26,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
     };
   };
+
   preConfigure = ''
     mkdir build
     cp \
@@ -37,20 +40,45 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs *.sh unittest/*.sh
   '';
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ codec2 ];
-  nativeCheckInputs = [ octave ];
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    codec2
+  ];
+
+  cmakeFlags = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
+    # unsupported option '-mfpu=' for target 'x86_64-apple-darwin'
+    "-DNEON=OFF"
+  ];
+
+  nativeCheckInputs = [
+    octave
+    sox
+  ];
+
+  disabledTests = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
+    # disable tests that require NEON
+    "SIMD_functions"
+  ];
 
   doCheck = true;
-  preCheck = ''
+  checkPhase = ''
+    runHook preCheck
+
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src"
+
+    ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'
+
+    runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Experimental Neural Net speech coding for FreeDV";
     homepage = "https://github.com/drowe67/LPCNet";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ doronbehar ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    platforms = lib.platforms.all;
   };
 })

pkgs/by-name/po/poliedros/package.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  ninja,
+  meson,
+  pkg-config,
+  wrapGAppsHook4,
+  glib,
+  desktop-file-utils,
+  appstream-glib,
+  gobject-introspection,
+  libadwaita,
+  nix-update-script,
+}:
+let
+  version = "1.0.1";
+in
+python3Packages.buildPythonApplication {
+  pname = "poliedros";
+  inherit version;
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "kriptolix";
+    repo = "Poliedros";
+    tag = "v${version}";
+    hash = "sha256-1lYEsfyl6ckH1TmMLRP+flnm77INiA8ntnGVWnwpLvs=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    glib
+    desktop-file-utils
+    appstream-glib
+    gobject-introspection
+  ];
+
+  pythonPath = [ python3Packages.pygobject3 ];
+
+  buildInputs = [ libadwaita ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Multi-type dice roller";
+    homepage = "https://github.com/kriptolix/Poliedros";
+    changelog = "https://github.com/kriptolix/Poliedros/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "poliedros";
+    maintainers = [ lib.maintainers.awwpotato ];
+  };
+}

pkgs/by-name/ru/ruffle/package.nix

@@ -22,17 +22,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0-nightly-2025-04-22";
+  version = "0-nightly-2025-05-01";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0-" finalAttrs.version;
-    hash = "sha256-jOTwDH5R1OfsRIeGBo/LquAuQzbKiD8NrHcB76zB5eg=";
+    hash = "sha256-EHX+S0+RZSOktAqgkczlJPbAoEa+cj2EllvhJRLAbK8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-oDFB4cWcrzXRG5VOIsblf4/mERJQfRew67MDSXyW644=";
+  cargoHash = "sha256-VwV7REm61mj7IqpX58qm0a8leVBRqJpkB6y1EBsxPaw=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

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

@@ -0,0 +1,62 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  gettext,
+  glib,
+  desktop-file-utils,
+  appstream-glib,
+  gobject-introspection,
+  libadwaita,
+  nix-update-script,
+}:
+let
+  version = "1.0.1";
+in
+python3Packages.buildPythonApplication {
+  pname = "teleprompter";
+  inherit version;
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "Nokse22";
+    repo = "teleprompter";
+    tag = "v${version}";
+    hash = "sha256-KnjZJbTM5EH/0aitqCtohE3Xy4ixOsDMthUn8kWjHq8=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    gettext
+    glib
+    desktop-file-utils
+    appstream-glib
+    gobject-introspection
+  ];
+
+  pythonPath = [ python3Packages.pygobject3 ];
+
+  buildInputs = [ libadwaita ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Stay on track during speeches";
+    homepage = "https://github.com/Nokse22/teleprompter";
+    changelog = "https://github.com/Nokse22/teleprompter/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "teleprompter";
+    maintainers = [ lib.maintainers.awwpotato ];
+  };
+}

pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-wacom";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Ct+1n/GmrS9xi8QIJDWKfwNL1kvNz3o+0tsxLZtwjmI=";
+    sha256 = "sha256-xTv3QPlLPJQ6C5t4Udy1H9IrLQGuik8prvGlpfFm1DQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/interpreters/octave/default.nix

@@ -97,12 +97,12 @@ let
   allPkgs = pkgs;
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "9.4.0";
+  version = "10.1.0";
   pname = "octave";
 
   src = fetchurl {
     url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-2pSBIFv6cXZgt9ShZzLYstWKrc6rSZPUEkKo4oSOpsE=";
+    sha256 = "sha256-rtRJy6N5/B4Rhuw/w8luCGB4knj7yCOuLOvmA0Q0S3g=";
   };
 
   postPatch = ''

pkgs/development/libraries/librsb/default.nix

@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "librsb";
-  version = "1.2.0.10";
+  version = "1.3.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g=";
+    sha256 = "sha256-GMb8RD+hz9KoEQ99S4jVu8tJO56Fs6YgFLi7V6hI4E8=";
   };
 
   # The default configure flags are still present when building
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   ];
   checkTarget = "tests";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://librsb.sourceforge.net/";
     description = "Shared memory parallel sparse matrix and sparse BLAS library";
     longDescription = ''
@@ -94,10 +94,10 @@ stdenv.mkDerivation rec {
       Contains libraries and header files for developing applications that
       want to make use of librsb.
     '';
-    license = with licenses; [ lgpl3Plus ];
-    maintainers = with maintainers; [ KarlJoad ];
-    platforms = platforms.all;
-    # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found
-    broken = stdenv.hostPlatform.isDarwin;
+    license = with lib.licenses; [ lgpl3Plus ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
+    platforms = lib.platforms.all;
+    # linking errors such as 'undefined reference to `gzungetc'
+    broken = true;
   };
 }

pkgs/development/octave-modules/arduino/default.nix

@@ -23,11 +23,11 @@ buildOctavePackage rec {
     arduino-core-unwrapped
   ];
 
-  meta = with lib; {
+  meta = {
     name = "Octave Arduino Toolkit";
-    homepage = "https://octave.sourceforge.io/arduino/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    homepage = "https://gnu-octave.github.io/packages/arduino/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Basic Octave implementation of the matlab arduino extension, allowing communication to a programmed arduino board to control its hardware";
   };
 }

pkgs/development/octave-modules/audio/default.nix

@@ -27,11 +27,11 @@ buildOctavePackage rec {
     rtmidi
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/audio/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/audio/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Audio and MIDI Toolbox for GNU Octave";
-    platforms = platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
+    platforms = lib.platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
   };
 }

pkgs/development/octave-modules/bim/default.nix

@@ -22,10 +22,10 @@ buildOctavePackage rec {
     msh
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/bim/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/bim/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Package for solving Diffusion Advection Reaction (DAR) Partial Differential Equations";
   };
 }

pkgs/development/octave-modules/bsltl/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0i8ry347y5f5db3702nhpsmfys9v18ks2fsmpdqpy3fcvrwaxdsb";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/bsltl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/bsltl/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Free collection of OCTAVE/MATLAB routines for working with the biospeckle laser technique";
   };
 }

pkgs/development/octave-modules/cgi/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0hygj7cpwrs2w9bfb7qrvv7gq410bfiddqvza8smg766pqmfp1s1";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/cgi/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/cgi/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Common Gateway Interface for Octave";
   };
 }

pkgs/development/octave-modules/communications/default.nix

@@ -23,10 +23,10 @@ buildOctavePackage rec {
     signal
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/communications/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/communications/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = " Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields";
   };
 }

pkgs/development/octave-modules/control/default.nix

@@ -41,10 +41,10 @@ buildOctavePackage rec {
     blas
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gnu-octave.github.io/packages/control/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library";
   };
 }

pkgs/development/octave-modules/data-smoothing/default.nix

@@ -18,10 +18,12 @@ buildOctavePackage rec {
     optim
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/data-smoothing/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/data-smoothing/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Algorithms for smoothing noisy data";
+    # Hasn't been updated since 2012, and fails to build with octave >= 10.1.0
+    broken = true;
   };
 }

pkgs/development/octave-modules/database/default.nix

@@ -31,10 +31,10 @@ buildOctavePackage rec {
     struct
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/database/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/database/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interface to SQL databases, currently only postgresql using libpq";
   };
 }

pkgs/development/octave-modules/dataframe/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "10ara084gkb7d5vxv9qv7zpj8b4mm5y06nccrdy3skw5nfbb4djx";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/dataframe/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/dataframe/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Data manipulation toolbox similar to R data.frame";
   };
 }

pkgs/development/octave-modules/dicom/default.nix

@@ -25,10 +25,10 @@ buildOctavePackage rec {
     gdcm
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/dicom/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/dicom/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Digital communications in medicine (DICOM) file io";
   };
 }

pkgs/development/octave-modules/divand/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0nmaz5j37dflz7p4a4lmwzkh7g1gghdh7ccvkbyy0fpgv9lr1amg";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/divand/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/divand/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Performs an n-dimensional variational analysis (interpolation) of arbitrarily located observations";
   };
 }

pkgs/development/octave-modules/doctest/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/doctest/index.html";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/doctest/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Find and run example code within documentation";
     longDescription = ''
       Find and run example code within documentation. Formatted blocks

pkgs/development/octave-modules/econometrics/default.nix

@@ -18,10 +18,12 @@ buildOctavePackage rec {
     optim
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/econometrics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/econometrics/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Econometrics functions including MLE and GMM based techniques";
+    # Hasn't been updated since 2012, and fails to build with octave >= 10.1.0
+    broken = true;
   };
 }

pkgs/development/octave-modules/fem-fenics/default.nix

@@ -25,10 +25,10 @@ buildOctavePackage rec {
     ffc
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/fem-fenics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/fem-fenics/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Package for the resolution of partial differential equations based on fenics";
     # Lots of compilation errors for newer octave versions and syntax errors
     broken = true;

pkgs/development/octave-modules/financial/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0f963yg6pwvrdk5fg7b71ny47gzy48nqxdzj2ngcfrvmb5az4vmf";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/financial/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/financial/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Monte Carlo simulation, options pricing routines, financial manipulation, plotting functions and additional date manipulation tools";
   };
 }

pkgs/development/octave-modules/fits/default.nix

@@ -33,10 +33,12 @@ buildOctavePackage rec {
     cfitsio
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/fits/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/fits/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions for reading, and writing FITS (Flexible Image Transport System) files using cfitsio";
+    # Hasn't been updated since 2015, and fails to build with octave >= 10.1.0
+    broken = true;
   };
 }

pkgs/development/octave-modules/fpl/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0cbpahn9flrv9ppp5xakhwh8vyyy7wzlsz22i3s93yqg9q2bh4ys";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/fpl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/fpl/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Collection of routines to export data produced by Finite Elements or Finite Volume Simulations in formats used by some visualization programs";
   };
 }

pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix

@@ -15,10 +15,10 @@ buildOctavePackage rec {
     sha256 = "sha256-lnYzX4rq3j7rrbD8m0EnrWpbMJD6tqtMVCYu4mlLFCM=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lmarkowsky/fuzzy-logic-toolkit";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Mostly MATLAB-compatible fuzzy logic toolkit for Octave";
   };
 }

pkgs/development/octave-modules/ga/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-hsrjh2rZFhP6WA+qaKjiGfJkDtT2nTlXlKr3jAJ5Y44=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/ga/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/ga/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Genetic optimization code";
   };
 }

pkgs/development/octave-modules/general/default.nix

@@ -23,10 +23,10 @@ buildOctavePackage rec {
     nettle
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/general/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/general/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "General tools for Octave";
   };
 }

pkgs/development/octave-modules/generate_html/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-CHJ0+90+SNXmslLrQc+8aetSnHK0m9PqEBipFuFjwHw=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/generate_html/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/generate_html/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides functions for generating HTML pages that contain the help texts for a set of functions";
     longDescription = ''
       This package provides functions for generating HTML pages that contain

pkgs/development/octave-modules/geometry/default.nix

@@ -19,13 +19,13 @@ buildOctavePackage rec {
     matgeom
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/geometry/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/geometry/";
+    license = with lib.licenses; [
       gpl3Plus
       boost
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Library for extending MatGeom functionality";
   };
 }

pkgs/development/octave-modules/gsl/default.nix

@@ -19,10 +19,10 @@ buildOctavePackage rec {
     gsl
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/gsl/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/gsl/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Octave bindings to the GNU Scientific Library";
     # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'?
     # error: no member named 'is_real_type' in 'octave_value'

pkgs/development/octave-modules/image-acquisition/default.nix

@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "image-acquisition";
-  version = "0.2.6";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Uehwk68GZ/M4WL5M3GF++mCPUg3M08Y0gkdO36/yhNI=";
+    sha256 = "sha256-vgLDbqFGlbXjDaxRtaBHAYYJ+wUjtB0NYYkQFIqTOgU=";
   };
 
   buildInputs = [
@@ -23,10 +23,10 @@ buildOctavePackage rec {
     libv4l
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/image-acquisition/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/image-acquisition/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions to capture images from connected devices";
     longDescription = ''
       The Octave-forge Image Aquisition package provides functions to

pkgs/development/octave-modules/image/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-m7JsyljrH77fs/hOPS5+HuteFtfr4yNbfBB9lPWNFBc=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/image/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/image/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions for processing images";
     longDescription = ''
       The Octave-forge Image package provides functions for processing

pkgs/development/octave-modules/instrument-control/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-Qm1aF+dbhwrDUSh8ViJHCZIc0DiZ1jI117TnSknqzX0=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/instrument-control/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/instrument-control/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Low level I/O functions for serial, i2c, spi, parallel, tcp, gpib, vxi11, udp and usbtmc interfaces";
   };
 }

pkgs/development/octave-modules/interval/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     mpfr
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/interval/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/interval/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interval arithmetic to evaluate functions over subsets of their domain";
     longDescription = ''
       The interval package for real-valued interval arithmetic allows one to

pkgs/development/octave-modules/io/default.nix

@@ -24,13 +24,13 @@ buildOctavePackage rec {
     unzip
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/io/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/io/";
+    license = with lib.licenses; [
       gpl3Plus
       bsd2
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Input/Output in external formats";
   };
 }

pkgs/development/octave-modules/level-set/default.nix

@@ -45,11 +45,11 @@ buildOctavePackage rec {
     cd -
   '';
 
-  meta = with lib; {
+  meta = {
     name = "Level Set";
-    homepage = "https://octave.sourceforge.io/level-set/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    homepage = "https://gnu-octave.github.io/packages/level-set/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
     # Got broke with octave 8.x update, and wasn't updated since 2019
     broken = true;

pkgs/development/octave-modules/linear-algebra/default.nix

@@ -13,14 +13,14 @@ buildOctavePackage rec {
     sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/linear-algebra/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/linear-algebra/";
+    license = with lib.licenses; [
       gpl3Plus
       lgpl3Plus
     ];
     # They claim to have a FreeBSD license, but none of their code seems to have it.
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional linear algebra code, including matrix functions";
   };
 }

pkgs/development/octave-modules/lssa/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "10h9lzsi7pqh93i7y50b618g05fnbw9n0i505bz5kz4avfa990zh";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/lssa/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/lssa/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Tools to compute spectral decompositions of irregularly-spaced time series";
     longDescription = ''
       A package implementing tools to compute spectral decompositions of

pkgs/development/octave-modules/ltfat/default.nix

@@ -32,11 +32,11 @@ buildOctavePackage rec {
     jdk
   ];
 
-  meta = with lib; {
+  meta = {
     name = "The Large Time-Frequency Analysis Toolbox";
-    homepage = "https://octave.sourceforge.io/ltfat/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    homepage = "https://gnu-octave.github.io/packages/ltfat/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Toolbox for working with time-frequency analysis, wavelets and signal processing";
     longDescription = ''
       The Large Time/Frequency Analysis Toolbox (LTFAT) is a Matlab/Octave
@@ -46,5 +46,7 @@ buildOctavePackage rec {
       Gabor and wavelet transforms along with routines for constructing windows
       (filter prototypes) and routines for manipulating coefficients.
     '';
+    # https://github.com/ltfat/ltfat/issues/203
+    broken = true;
   };
 }

pkgs/development/octave-modules/mapping/default.nix

@@ -25,10 +25,10 @@ buildOctavePackage rec {
     geometry
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/mapping/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/mapping/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Simple mapping and GIS .shp .dxf and raster file functions";
   };
 }

pkgs/development/octave-modules/matgeom/default.nix

@@ -13,13 +13,13 @@ buildOctavePackage rec {
     sha256 = "sha256-azRPhwMVvydCyojA/rXD2og1tPTL0vii15OveYQF+SA=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/matgeom/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/matgeom/";
+    license = with lib.licenses; [
       bsd2
       gpl3Plus
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Geometry toolbox for 2D/3D geometric computing";
   };
 }

pkgs/development/octave-modules/miscellaneous/default.nix

@@ -24,10 +24,10 @@ buildOctavePackage rec {
     units
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/miscellaneous/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/miscellaneous/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Miscellaneous tools that don't fit somewhere else";
   };
 }

pkgs/development/octave-modules/msh/default.nix

@@ -45,10 +45,10 @@ buildOctavePackage rec {
     splines
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/msh/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/msh/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Create and manage triangular and tetrahedral meshes for Finite Element or Finite Volume PDE solvers";
     longDescription = ''
       Create and manage triangular and tetrahedral meshes for Finite Element or

pkgs/development/octave-modules/mvn/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "00w69hxqnqdm3744z6p7gvzci44a3gy228x6bgq3xf5n3jwicnmg";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/mvn/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/mvn/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Multivariate normal distribution clustering and utility functions";
   };
 }

pkgs/development/octave-modules/nan/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     blas
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/nan/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/nan/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Statistics and machine learning toolbox for data with and w/o missing values";
   };
 }

pkgs/development/octave-modules/ncarray/default.nix

@@ -23,10 +23,10 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/ncarray/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/ncarray/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Access a single or a collection of NetCDF files as a multi-dimensional array";
   };
 }

pkgs/development/octave-modules/netcdf/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     netcdf
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/netcdf/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/netcdf/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "NetCDF interface for Octave";
   };
 }

pkgs/development/octave-modules/nurbs/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-QfF1tu9z/FQWNDirRs5OP3IRJOGkkR2lnHELn3ItknY=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/nurbs/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/nurbs/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Collection of routines for the creation, and manipulation of Non-Uniform Rational B-Splines (NURBS), based on the NURBS toolbox by Mark Spink";
   };
 }

pkgs/development/octave-modules/ocl/default.nix

@@ -1,30 +1,29 @@
 {
   buildOctavePackage,
-  stdenv,
   lib,
   fetchurl,
 }:
 
 buildOctavePackage rec {
   pname = "ocl";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ErVMfYkWcdS+UqUH7q7gNQXQwAjrcyiUkWxagAKj3w0=";
+    sha256 = "sha256-g/HLE0qjnzYkq3t3OhxFBpL250JWbWjHJBP0SYJSOZU=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/ocl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/ocl/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Use OpenCL for parallelization";
     longDescription = ''
       Package using OpenCL for parallelization, mostly suitable to
       Single-Instruction-Multiple-Data (SIMD) computations, selectively
       using available OpenCL hardware and drivers.
     '';
-    # error: structure has no member 'dir'
-    broken = stdenv.hostPlatform.isDarwin;
+    # https://savannah.gnu.org/bugs/?66964
+    broken = true;
   };
 }

pkgs/development/octave-modules/octclip/default.nix

@@ -22,11 +22,11 @@ buildOctavePackage rec {
     sed -i s/"error(errorText)"/"error(\"%s\", errorText)"/g src/*.cc
   '';
 
-  meta = with lib; {
+  meta = {
     name = "GNU Octave Clipping Polygons Tool";
-    homepage = "https://octave.sourceforge.io/octclip/index.html";
-    license = with licenses; [ gpl3Plus ]; # modified BSD?
-    maintainers = with maintainers; [ KarlJoad ];
+    homepage = "https://gnu-octave.github.io/packages/octclip/";
+    license = with lib.licenses; [ gpl3Plus ]; # modified BSD?
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
   };
 }

pkgs/development/octave-modules/octproj/default.nix

@@ -26,10 +26,10 @@ buildOctavePackage rec {
     proj
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/octproj/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/octproj/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
   };
 }

pkgs/development/octave-modules/optics/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "1d9z82241a1zmr8m1vgw10pyk81vn0q4dcyx7d05pigfn5gykrgc";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/optics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/optics/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions covering various aspects of optics";
   };
 }

pkgs/development/octave-modules/optim/default.nix

@@ -27,14 +27,16 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/optim/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/optim/";
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
     # Modified BSD code seems removed
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Non-linear optimization toolkit";
+    # Hasn't been updated since 2022, and fails to build with octave >= 10.1.0
+    broken = true;
   };
 }

pkgs/development/octave-modules/optiminterp/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     gfortran
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/optiminterp/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/optiminterp/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Optimal interpolation toolbox for octave";
     longDescription = ''
       An optimal interpolation toolbox for octave. This package provides

pkgs/development/octave-modules/parallel/default.nix

@@ -31,10 +31,10 @@ buildOctavePackage rec {
     struct
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/parallel/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/parallel/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Parallel execution package";
     # Although upstream has added an identical patch to that of ../database, it
     # still won't build with octave>8.1

pkgs/development/octave-modules/quaternion/default.nix

@@ -21,10 +21,10 @@ buildOctavePackage rec {
     sed -i s/is_bool_type/islogical/g src/*.cc
   '';
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/quaternion/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/quaternion/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Quaternion package for GNU Octave, includes a quaternion class with overloaded operators";
   };
 }

pkgs/development/octave-modules/queueing/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "1yhw277i1qgmddf6wbfb6a4zrfhvplkmfr20q1l15z4xi8afnm6d";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/queueing/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/queueing/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides functions for queueing networks and Markov chains analysis";
     longDescription = ''
       The queueing package provides functions for queueing networks and Markov

pkgs/development/octave-modules/signal/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     control
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/signal/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/signal/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Signal processing tools, including filtering, windowing and display functions";
   };
 }

pkgs/development/octave-modules/sockets/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/sockets/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/sockets/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Socket functions for networking from within octave";
   };
 }

pkgs/development/octave-modules/sparsersb/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     librsb
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/sparsersb/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/sparsersb/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
     # Broken since octave>8.x
     broken = true;

pkgs/development/octave-modules/splines/default.nix

@@ -13,13 +13,13 @@ buildOctavePackage rec {
     sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/splines/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/splines/";
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional spline functions";
   };
 }

pkgs/development/octave-modules/statistics/default.nix

@@ -20,13 +20,13 @@ buildOctavePackage rec {
     io
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://packages.octave.org/statistics";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Statistics package for GNU Octave";
   };
 }

pkgs/development/octave-modules/stk/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/stk/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/stk/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "STK is a (not so) Small Toolbox for Kriging";
     longDescription = ''
       The STK is a (not so) Small Toolbox for Kriging. Its primary focus is on

pkgs/development/octave-modules/strings/default.nix

@@ -34,11 +34,11 @@ buildOctavePackage rec {
     sed -i s/toascii/double/g inst/*.m
   '';
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/strings/index.html";
-    license = licenses.gpl3Plus;
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/strings/";
+    license = lib.licenses.gpl3Plus;
     # Claims to have a freebsd license, but I found none.
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional functions for manipulation and analysis of strings";
     # Some pcre symbols claimed to be missing
     broken = stdenv.hostPlatform.isDarwin;

pkgs/development/octave-modules/struct/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-/M6n3YTBEE7TurtHoo8F4AEqicKE85qwlAkEUJFSlM4=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/struct/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/struct/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional structure manipulation functions";
   };
 }

pkgs/development/octave-modules/symbolic/default.nix

@@ -26,10 +26,10 @@ buildOctavePackage rec {
 
   propagatedBuildInputs = [ pythonEnv ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/symbolic/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/symbolic/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Adds symbolic calculation features to GNU Octave";
   };
 }

pkgs/development/octave-modules/tisean/default.nix

@@ -25,10 +25,10 @@ buildOctavePackage rec {
     signal
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/tisean/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/tisean/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Port of TISEAN 3.0.1";
     # Broken since octave 8.x update, and wasn't updated since 2021
     broken = true;

pkgs/development/octave-modules/tsa/default.nix

@@ -18,10 +18,10 @@ buildOctavePackage rec {
     nan
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/tsa/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/tsa/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Stochastic concepts and maximum entropy methods for time series analysis";
   };
 }

pkgs/development/octave-modules/vibes/default.nix

@@ -18,13 +18,13 @@ buildOctavePackage rec {
     vibes
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/vibes/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/vibes/";
+    license = with lib.licenses; [
       gpl3Plus
       mit
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Easily display results (boxes, pavings) from interval methods";
     longDescription = ''
       The VIBes API allows one to easily display results (boxes, pavings) from

pkgs/development/octave-modules/video/default.nix

@@ -26,13 +26,13 @@ buildOctavePackage rec {
     ffmpeg
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/video/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/video/";
+    license = with lib.licenses; [
       gpl3Plus
       bsd3
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
   };
 }

pkgs/development/octave-modules/vrml/default.nix

@@ -31,13 +31,13 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/vrml/index.html";
-    license = with licenses; [
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/vrml/";
+    license = with lib.licenses; [
       gpl3Plus
       fdl12Plus
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "3D graphics using VRML";
     # Marked this way until KarlJoad gets freewrl as a runtime dependency.
     broken = true;

pkgs/development/octave-modules/windows/default.nix

@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-j/goQc57jcfxlCsbf31Mx8oNud1vNE0D/hNfXyvVmTc=";
   };
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/windows/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/windows/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides COM interface and additional functionality on Windows";
   };
 }

pkgs/development/octave-modules/zeromq/default.nix

@@ -33,10 +33,10 @@ buildOctavePackage rec {
     zeromq
   ];
 
-  meta = with lib; {
-    homepage = "https://octave.sourceforge.io/zeromq/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+  meta = {
+    homepage = "https://gnu-octave.github.io/packages/zeromq/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "ZeroMQ bindings for GNU Octave";
   };
 }

pkgs/development/python-modules/jupyter-book/default.nix

@@ -92,34 +92,33 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # touch the network
-      "test_create_from_cookiecutter"
+  disabledTests = [
+    # touch the network
+    "test_create_from_cookiecutter"
 
-      # flaky?
-      "test_execution_timeout"
+    # flaky?
+    "test_execution_timeout"
 
-      # require texlive
-      "test_toc"
-      "test_toc_latex_parts"
-      "test_toc_latex_urllink"
+    # require texlive
+    "test_toc"
+    "test_toc_latex_parts"
+    "test_toc_latex_urllink"
 
-      # AssertionError: assert 'There was an error in building your book' in '1'
-      "test_build_errors"
+    # AssertionError: assert 'There was an error in building your book' in '1'
+    "test_build_errors"
 
-      # WARNING: Executing notebook failed: CellExecutionError [mystnb.exec]
-      "test_build_dirhtml_from_template"
-      "test_build_from_template"
-      "test_build_page"
-      "test_build_singlehtml_from_template"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # pytest.PytestUnraisableExceptionWarning: Exception ignored in: <sqlite3.Connection object at 0x115dcc9a0>
-      # ResourceWarning: unclosed database in <sqlite3.Connection object at 0x115dcc9a0>
-      "test_clean_html_latex"
-      "test_clean_latex"
-    ];
+    # WARNING: Executing notebook failed: CellExecutionError [mystnb.exec]
+    "test_build_dirhtml_from_template"
+    "test_build_from_template"
+    "test_build_page"
+    "test_build_singlehtml_from_template"
+
+    # pytest.PytestUnraisableExceptionWarning: Exception ignored in: <sqlite3.Connection object at 0x115dcc9a0>
+    # ResourceWarning: unclosed database in <sqlite3.Connection object at 0x115dcc9a0>
+    "test_clean_book"
+    "test_clean_html_latex"
+    "test_clean_latex"
+  ];
 
   disabledTestPaths = [
     # require texlive

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

@@ -22,7 +22,7 @@ in
 buildPythonPackage rec {
   pname = "playwright";
   # run ./pkgs/development/python-modules/playwright/update.sh to update
-  version = "1.50.0";
+  version = "1.52.0";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "playwright-python";
     tag = "v${version}";
-    hash = "sha256-g32QwEA4Ofzh7gVEsC++uA/XqT1eIrUH+fQi15SRxko=";
+    hash = "sha256-8hl+5kIORq9uwYbf9354iqlL0RIkhTnokzQXoYFr5AI=";
   };
 
   patches = [
@@ -51,9 +51,7 @@ buildPythonPackage rec {
     git config --global user.name "nixpkgs"
     git commit -m "workaround setuptools-scm"
 
-    substituteInPlace pyproject.toml \
-      --replace-fail 'requires = ["setuptools==75.6.0", "setuptools-scm==8.1.0", "wheel==0.45.1", "auditwheel==6.2.0"]' \
-                     'requires = ["setuptools", "setuptools-scm", "wheel"]'
+    sed -i -e 's/requires = \["setuptools==.*", "setuptools-scm==.*", "wheel==.*", "auditwheel==.*"\]/requires = ["setuptools", "setuptools-scm", "wheel"]/' pyproject.toml
 
     # setup.py downloads and extracts the driver.
     # This is done manually in postInstall instead.

pkgs/development/python-modules/playwright/update.sh

@@ -32,7 +32,7 @@ replace_sha() {
 prefetch_browser() {
   # nix-prefetch is used to obtain sha with `stripRoot = false`
   # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53
-  nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }"
+  nix-prefetch --option extra-experimental-features flakes -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }"
 }
 
 update_browser() {

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

@@ -64,6 +64,7 @@
   tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json;
   tree-sitter-make = lib.importJSON ./tree-sitter-make.json;
   tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json;
+  tree-sitter-netlinx = lib.importJSON ./tree-sitter-netlinx.json;
   tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json;
   tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
   tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json

@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/norgate-av/tree-sitter-netlinx",
+  "rev": "6d3c01e54d150c6d3dcf99cad95a1f5fa0293018",
+  "date": "2025-04-20T17:23:44+01:00",
+  "path": "/nix/store/mnl4bx3006gy841ky2vgyyfx9fnibm2m-tree-sitter-netlinx",
+  "sha256": "13kyl1a0d9x6k6ivcyzbplkcsdjy3kd4raym1zz8c5gs9xwg6vb4",
+  "hash": "sha256-ZG3zeE/6FYb+D9WrTNocXjbNJr3re7ajmaanBlSgfo4=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

pkgs/development/tools/parsing/tree-sitter/update.nix

@@ -480,6 +480,10 @@ let
       orga = "uncenter";
       repo = "tree-sitter-tera";
     };
+    "tree-sitter-netlinx" = {
+      orga = "norgate-av";
+      repo = "tree-sitter-netlinx";
+    };
   };
 
   allGrammars =

pkgs/development/web/playwright/browsers.json

@@ -2,15 +2,19 @@
   "comment": "This file is kept up to date via update.sh",
   "browsers": {
     "chromium": {
-      "revision": "1155",
-      "browserVersion": "133.0.6943.16"
+      "revision": "1169",
+      "browserVersion": "136.0.7103.25"
+    },
+    "chromium-headless-shell": {
+      "revision": "1169",
+      "browserVersion": "136.0.7103.25"
     },
     "firefox": {
-      "revision": "1471",
-      "browserVersion": "134.0"
+      "revision": "1482",
+      "browserVersion": "137.0"
     },
     "webkit": {
-      "revision": "2123",
+      "revision": "2158",
       "revisionOverrides": {
         "debian11-x64": "2105",
         "debian11-arm64": "2105",
@@ -20,10 +24,12 @@
         "mac11-arm64": "1816",
         "mac12": "2009",
         "mac12-arm64": "2009",
+        "mac13": "2140",
+        "mac13-arm64": "2140",
         "ubuntu20.04-x64": "2092",
         "ubuntu20.04-arm64": "2092"
       },
-      "browserVersion": "18.2"
+      "browserVersion": "18.4"
     },
     "ffmpeg": {
       "revision": "1011",

pkgs/development/web/playwright/chromium-headless-shell.nix

@@ -30,8 +30,8 @@ let
       stripRoot = false;
       hash =
         {
-          x86_64-linux = "sha256-UNLSiI9jWLev2YwqiXuoHwJfdB4teNhEfQjQRBEo8uY=";
-          aarch64-linux = "sha256-aVGLcJHFER09frJdKsGW/pKPl5MXoXef2hy5WTA8rS4=";
+          x86_64-linux = "sha256-WCn3j9JnKqGJoQ4X2FWdghha/AxusqCYTCL0sEpA2pM=";
+          aarch64-linux = "sha256-IIz4E4ylXU5e4XAyqOI6yXc680Lb5bFze0VRuB8Wwck=";
         }
         .${system} or throwSystem;
     };
@@ -66,8 +66,8 @@ let
     stripRoot = false;
     hash =
       {
-        x86_64-darwin = "sha256-c26ubAgM9gQPaYqobQyS3Y7wvMUmmdpDlrYmZJrUgho=";
-        aarch64-darwin = "sha256-XRFqlhVx+GuDxz/kDP8TtyPQfR0JbFD0qu5OSywGTX8=";
+        x86_64-darwin = "sha256-346DDhORd+wGchEpU3Tf3DSwlo8fejomgSUqmF/HmA4=";
+        aarch64-darwin = "sha256-3WMfwOVlap5HxLzalg8+TTlsyda/HPabJMM0T31UKlE=";
       }
       .${system} or throwSystem;
   };

pkgs/development/web/playwright/chromium.nix

@@ -34,8 +34,8 @@ let
     stripRoot = false;
     hash =
       {
-        x86_64-darwin = "sha256-seMHD+TmxrfgsN6sLN2Bp3WgAooDnlSxGN6CPw1Q790=";
-        aarch64-darwin = "sha256-SsIRzxTIuf/mwsYvRM2mv8PzWQAAflxOyoK5TuyhMAU=";
+        x86_64-darwin = "sha256-IJxCYtHTOtBxQdGbiLz+PODQL4rmBn4WXNJ3QNr0D/I=";
+        aarch64-darwin = "sha256-6QP1OY1krhcfMf5rNzbd55W/Wg02LnbqaU7aKWhJ7qM=";
       }
       .${system} or throwSystem;
   };

pkgs/development/web/playwright/driver.nix

@@ -27,20 +27,20 @@ let
     }
     .${system} or throwSystem;
 
-  version = "1.50.1";
+  version = "1.52.0";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
     rev = "v${version}";
-    hash = "sha256-s4lJRdsA4H+Uf9LjriZ6OimBl5A9Pf4fvhWDw2kOMkg=";
+    hash = "sha256-+2ih1tZHqbNtyabtYi1Sd3f9Qs3Is8zUMNBt6Lo2IKs=";
   };
 
   babel-bundle = buildNpmPackage {
     pname = "babel-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/babel";
-    npmDepsHash = "sha256-HrDTkP2lHl2XKD8aGpmnf6YtSe/w9UePH5W9QfbaoMg=";
+    npmDepsHash = "sha256-sdl+rMCmuOmY1f7oSfGuAAFCiPCFzqkQtFCncL4o5LQ=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -70,7 +70,7 @@ let
     pname = "utils-bundle-core";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright-core/bundles/utils";
-    npmDepsHash = "sha256-TarWFVp5JFCKZIvBUTohzzsFaLZHV79lN5+G9+rCP8Y=";
+    npmDepsHash = "sha256-3hdOmvs/IGAgW7vhldms9Q9/ZQfbjbc+xP+JEtGJ7g8=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -92,9 +92,12 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence
-    npmDepsHash = "sha256-RoKw3Ie41/4DsjCeqkMhKFyjDPuvMgxajZYZhRdiTuY=";
+    npmDepsHash = "sha256-Os/HvvL+CFFb2sM+EDdxF2hN28Sg7oy3vBBfkIipkqs=";
 
-    nativeBuildInputs = [ cacert ];
+    nativeBuildInputs = [
+      cacert
+      jq
+    ];
 
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;
 
@@ -127,6 +130,12 @@ let
       mkdir -p "$out/lib/node_modules/playwright"
       cp -r packages/playwright/!(bundles|src|node_modules|.*) "$out/lib/node_modules/playwright"
 
+      # for not supported platforms (such as NixOS) playwright assumes that it runs on ubuntu-20.04
+      # that forces it to use overridden webkit revision
+      # let's remove that override to make it use latest revision provided in Nixpkgs
+      # https://github.com/microsoft/playwright/blob/baeb065e9ea84502f347129a0b896a85d2a8dada/packages/playwright-core/src/server/utils/hostPlatform.ts#L111
+      jq '(.browsers[] | select(.name == "webkit") | .revisionOverrides) |= del(."ubuntu20.04-x64", ."ubuntu20.04-arm64")' \
+        packages/playwright-core/browsers.json > browser.json.tmp && mv browser.json.tmp packages/playwright-core/browsers.json
       mkdir -p "$out/lib/node_modules/playwright-core"
       cp -r packages/playwright-core/!(bundles|src|bin|.*) "$out/lib/node_modules/playwright-core"
 
@@ -197,7 +206,7 @@ let
     {
       withChromium ? true,
       withFirefox ? true,
-      withWebkit ? true,
+      withWebkit ? true, # may require `export PLAYWRIGHT_HOST_PLATFORM_OVERRIDE="ubuntu-24.04"`
       withFfmpeg ? true,
       withChromiumHeadlessShell ? true,
       fontconfig_file ? makeFontsConf {

pkgs/development/web/playwright/firefox.nix

@@ -17,8 +17,8 @@ let
       }.zip";
       hash =
         {
-          x86_64-linux = "sha256-53DXgD/OzGo7fEp/DBX1TiBBpFSHwiluqBji6rFKTtE=";
-          aarch64-linux = "sha256-CBg2PgAXU1ZWUob73riEkQmn/EmIqhvOgBPSAphkAyM=";
+          x86_64-linux = "sha256-tZ5rDLVzNaGILydgGbSOjtgfoRx0DWesZMmW0X8Pphc=";
+          aarch64-linux = "sha256-2NOK02C2APHVh4gVrQygrazGUJzJXH/3uOYDoyIn7fU=";
         }
         .${system} or throwSystem;
     };
@@ -41,8 +41,8 @@ let
     stripRoot = false;
     hash =
       {
-        x86_64-darwin = "sha256-GbrbNMFv1dT8Duo2otoZvmZk4Sgj81aRNwPAGKkRlnI=";
-        aarch64-darwin = "sha256-/e51eJTCqr8zEeWWJNS2UgPT9Y+a33Dj619JkCVVeRs=";
+        x86_64-darwin = "sha256-2j59mGvDiHMwmUQQFRVhToCooBdIGkF5s9iuXrVenHU=";
+        aarch64-darwin = "sha256-L7ffypyrX8qSCXksNxnihEZaV+wChoggGIcCuqosXzA=";
       }
       .${system} or throwSystem;
   };

pkgs/development/web/playwright/webkit.nix

@@ -126,8 +126,8 @@ let
       stripRoot = false;
       hash =
         {
-          x86_64-linux = "sha256-jw/wQ2Ql7KNpquz5CK+Mo6nPcCbMf8jeSQT64Vt/sLs=";
-          aarch64-linux = "sha256-vKAvl1kMxTE4CsDryseWF5lxf2iYOYkHHXAdPCnfnHk=";
+          x86_64-linux = "sha256-kGTfPFosn8BsBDo9boJWgkPtdAig8+Ffv3Q4eYPy5ls=";
+          aarch64-linux = "sha256-9NFR3j8M9i3Gk/LCwK+LRpKzJsTt3w2VHGmsGtsoKJU=";
         }
         .${system} or throwSystem;
     };
@@ -201,8 +201,8 @@ let
     stripRoot = false;
     hash =
       {
-        x86_64-darwin = "sha256-6GpzcA77TthcZEtAC7s3dVpnLk31atw7EPxKUZeC5i4=";
-        aarch64-darwin = "sha256-lDyeehVveciOsm4JZvz7CPphkl/ryRK1rz7DOcEDzYc=";
+        x86_64-darwin = "sha256-yvIscuu+37eFH/lEhTPostoJ5kHmpdkZiRBtKWDlOuw=";
+        aarch64-darwin = "sha256-VtOmp/YJ8oRBZvDg4sNskY7TVQdHglwkAveybY7QYno=";
       }
       .${system} or throwSystem;
   };