Merge staging-next into staging

.git-blame-ignore-revs

@@ -163,6 +163,15 @@ fbdcdde04a7caa007e825a8b822c75fab9adb2d6
 # step-cli: format package.nix with nixfmt (#331629)
 fc7a83f8b62e90de5679e993d4d49ca014ea013d
 
+# ndn-cxx: format with nixfmt-rfc-style
+160b2b769c3b8a6d1ae9947afa77520fa2887db7
+
+# ndn-tools: format with nixfmt-rfc-style
+4882ef721ce3d7bb3b5e48ff80125255db515013
+
+# nfd: format with nixfmt-rfc-style
+548c2377fa81e2abfc192fbf4f521e601251c468
+
 # darwin.stdenv: format with nixfmt-rfc-style (#333962)
 93c10ac9e561c6594d3baaeaff2341907390d9b8
 

doc/languages-frameworks/bower.section.md

@@ -4,7 +4,7 @@
 
 The end result of running Bower is a `bower_components` directory which can be included in the web app's build process.
 
-Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `nodePackages.bower2nix`.
+Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`.
 
 ## bower2nix usage {#ssec-bower2nix-usage}
 

maintainers/maintainer-list.nix

@@ -3286,6 +3286,12 @@
       { fingerprint = "8916 F727 734E 77AB 437F  A33A 19AB 76F5 CEE1 1392"; }
     ];
   };
+  CaiqueFigueiredo = {
+    email = "public@caiquefigueiredo.me";
+    github = "caiquefigueiredo";
+    githubId = 20440897;
+    name = "Caique";
+  };
   CaitlinDavitt = {
     email = "CaitlinDavitt@gmail.com";
     github = "CaitlinDavitt";
@@ -14253,6 +14259,12 @@
     githubId = 42215704;
     name = "Moritz Böhme";
   };
+  mortenmunk = {
+    email = "mortenmunk97@gmail.com";
+    github = "MortenMunk";
+    githubId = 92527083;
+    name = "Morten Munk";
+  };
   MostAwesomeDude = {
     email = "cds@corbinsimpson.com";
     github = "MostAwesomeDude";

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

@@ -219,6 +219,9 @@
 
 - The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network.
 
+- qBittorrent has been updated to major version 5, which drops support for Qt 5.
+  The `qbittorrent-qt5` package has been removed.
+
 - The fcgiwrap module now allows multiple instances running as distinct users.
   The option `services.fgciwrap` now takes an attribute set of the
   configuration of each individual instance.

nixos/modules/services/monitoring/graphite.nix

@@ -273,6 +273,7 @@ in {
         after = [ "network.target" ];
         environment = carbonEnv;
         serviceConfig = {
+          Slice = "system-graphite.slice";
           RuntimeDirectory = name;
           ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
@@ -295,6 +296,7 @@ in {
         after = [ "network.target" ];
         environment = carbonEnv;
         serviceConfig = {
+          Slice = "system-graphite.slice";
           RuntimeDirectory = name;
           ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
@@ -311,6 +313,7 @@ in {
         after = [ "network.target" ];
         environment = carbonEnv;
         serviceConfig = {
+          Slice = "system-graphite.slice";
           RuntimeDirectory = name;
           ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
@@ -360,6 +363,7 @@ in {
           User = "graphite";
           Group = "graphite";
           PermissionsStartOnly = true;
+          Slice = "system-graphite.slice";
         };
         preStart = ''
           if ! test -e ${dataDir}/db-created; then
@@ -397,6 +401,7 @@ in {
           WorkingDirectory = dataDir;
           User = "graphite";
           Group = "graphite";
+          Slice = "system-graphite.slice";
         };
         preStart = ''
           if ! test -e ${dataDir}/db-created; then
@@ -413,6 +418,11 @@ in {
       cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay ||
       cfg.web.enable || cfg.seyren.enable
      ) {
+      systemd.slices.system-graphite = {
+        description = "Graphite Graphing System Slice";
+        documentation = [ "https://graphite.readthedocs.io/en/latest/overview.html" ];
+      };
+
       users.users.graphite = {
         uid = config.ids.uids.graphite;
         group = "graphite";

pkgs/applications/editors/vscode/extensions/default.nix

@@ -313,8 +313,8 @@ let
         mktplcRef = {
           name = "vscode-apollo";
           publisher = "apollographql";
-          version = "2.3.2";
+          version = "2.3.3";
-          hash = "sha256-5PAmyy4RX2hLgviWxgnxGZjgeFWZaJKNiYGNdCTL0IE=";
+          hash = "sha256-pxj3BM+LJPS9KxxniEtBLT3x1FERGr4yPndxOSVLgR8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";

pkgs/applications/networking/instant-messengers/element/pin.nix

@@ -1,9 +1,9 @@
 {
-  "version" = "1.11.77";
+  "version" = "1.11.79";
   "hashes" = {
-    "desktopSrcHash" = "sha256-y7cmTSkNzA4aNY7z9sjgyIquTPVvl+nH7BHUx/2nJ5A=";
+    "desktopSrcHash" = "sha256-w9JWrStxmiiffu8kKVxM5h8Frxig7v4Vul3YwTnJias=";
     "desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd";
-    "webSrcHash" = "sha256-IeBuLlcorsHZ78P6h5LVCCGHauqzwwm2Lc9B07su86Y=";
+    "webSrcHash" = "sha256-rla55a0SgeWddXpgaDfsvPcL00NP4DbMDgtc25TM4dw=";
-    "webYarnHash" = "0nm70m37kqkb959vi69r8zidsh25nzgn1550yl46pzihzbiqm8nx";
+    "webYarnHash" = "084nm85y2fmzi27i0050hnxa4m2bqcbl7fn33zd1yini8dwr2n7s";
   };
 }

pkgs/applications/networking/instant-messengers/teamspeak/client.nix

@@ -1,6 +1,30 @@
-{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
+{
-, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config
+  lib,
-, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages
+  stdenv,
+  fetchurl,
+  fetchzip,
+  makeWrapper,
+  makeDesktopItem,
+  zlib,
+  glib,
+  libpng,
+  freetype,
+  openssl,
+  xorg,
+  fontconfig,
+  qtbase,
+  qtwebengine,
+  qtwebchannel,
+  qtsvg,
+  qtwebsockets,
+  xkeyboard_config,
+  alsa-lib,
+  libpulseaudio ? null,
+  libredirect,
+  quazip,
+  which,
+  perl,
+  llvmPackages,
 }:
 
 let
@@ -9,12 +33,33 @@ let
 
   libDir = "lib64";
 
-  deps =
+  deps = [
-    [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl
+    zlib
-      xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
+    glib
-      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg
+    libpng
-      qtwebsockets libpulseaudio quazip llvmPackages.libcxx
+    freetype
-    ];
+    xorg.libSM
+    xorg.libICE
+    xorg.libXrender
+    openssl
+    xorg.libXrandr
+    xorg.libXfixes
+    xorg.libXcursor
+    xorg.libXinerama
+    xorg.libxcb
+    fontconfig
+    xorg.libXext
+    xorg.libX11
+    alsa-lib
+    qtbase
+    qtwebengine
+    qtwebchannel
+    qtsvg
+    qtwebsockets
+    libpulseaudio
+    quazip
+    llvmPackages.libcxx
+  ];
 
   desktopItem = makeDesktopItem {
     name = "teamspeak";
@@ -38,15 +83,14 @@ stdenv.mkDerivation rec {
   };
 
   # grab the plugin sdk for the desktop icon
-  pluginsdk = fetchurl {
+  pluginsdk = fetchzip {
-    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.1.1.1.zip";
+    url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
-    sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
+    hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     which
-    unzip
     perl # Installer script needs `shasum`
   ];
 
@@ -54,23 +98,21 @@ stdenv.mkDerivation rec {
   # ++ exec
   # + PAGER_PATH=
   # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs.
-  unpackPhase =
+  unpackPhase = ''
-    ''
+    echo -e '\ny' | PAGER=cat sh -xe $src
-      echo -e '\ny' | PAGER=cat sh -xe $src
+    cd TeamSpeak*
-      cd TeamSpeak*
+  '';
-    '';
 
-  buildPhase =
+  buildPhase = ''
-    ''
+    mv ts3client_linux_${arch} ts3client
-      mv ts3client_linux_${arch} ts3client
+    echo "patching ts3client..."
-      echo "patching ts3client..."
+    patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client
-      patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client
+    patchelf \
-      patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
-        --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
+      --force-rpath \
-        --force-rpath \
+      ts3client
-        ts3client
+  '';
-    '';
 
   installPhase =
     ''
@@ -86,8 +128,7 @@ stdenv.mkDerivation rec {
 
       # Make a desktop item
       mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/
-      unzip ${pluginsdk}
+      cp ${pluginsdk}/doc/_static/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png
-      cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png
       cp ${desktopItem}/share/applications/* $out/share/applications/
 
       # Make a symlink to the binary from bin.
@@ -97,9 +138,10 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/ts3client \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
         --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
-    '' /* wayland is currently broken, remove when TS3 fixes that */ + ''
+    '' # wayland is currently broken, remove when TS3 fixes that
-        --set QT_QPA_PLATFORM xcb \
+    + ''
-        --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
+      --set QT_QPA_PLATFORM xcb \
+      --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
     '';
 
   dontStrip = true;
@@ -110,47 +152,17 @@ stdenv.mkDerivation rec {
     homepage = "https://teamspeak.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = {
+      # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
       fullName = "Teamspeak client license";
       url = "https://www.teamspeak.com/en/privacy-and-terms/";
       free = false;
     };
-    maintainers = with maintainers; [ lhvwb lukegb atemu ];
+    maintainers = with maintainers; [
+      lhvwb
+      lukegb
+      atemu
+    ];
     mainProgram = "ts3client";
     platforms = [ "x86_64-linux" ];
   };
 }
-
-/*
-License issues:
-Date: Mon, 10 Dec 2007 19:55:16 -0500
-From: TeamSpeak Sales <sales@tritoncia.com>
-To: 'Marc Weber' <marco-oweber@gmx.de>
-Subject: RE: teamspeak on nix?
-
-Yes, that would be fine.  As long as you are not renting servers or selling
-TeamSpeak then you are more than welcome to distribute it.
-
-Thank you,
-
-TeamSpeak Sales Team
-________________________________
-e-Mail: sales@tritoncia.com
-TeamSpeak: http://www.TeamSpeak.com
-Account Login: https://sales.TritonCIA.com/users
-
-
-
------Original Message-----
-From: Marc Weber [mailto:marco-oweber@gmx.de]
-Sent: Monday, December 10, 2007 5:03 PM
-To: sales@tritoncia.com
-Subject: teamspeak on nix?
-
-Hello,
-
-nix is very young software distribution system (http://nix.cs.uu.nl/)
-I'd like to ask wether you permit us to add teamspeak (server/ client?)
-
-Sincerly
-Marc Weber (small nix contributor)
-*/

pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt

@@ -0,0 +1,32 @@
+License issues:
+Date: Mon, 10 Dec 2007 19:55:16 -0500
+From: TeamSpeak Sales <sales@tritoncia.com>
+To: 'Marc Weber' <marco-oweber@gmx.de>
+Subject: RE: teamspeak on nix?
+
+Yes, that would be fine.  As long as you are not renting servers or selling
+TeamSpeak then you are more than welcome to distribute it.
+
+Thank you,
+
+TeamSpeak Sales Team
+________________________________
+e-Mail: sales@tritoncia.com
+TeamSpeak: http://www.TeamSpeak.com
+Account Login: https://sales.TritonCIA.com/users
+
+
+
+-----Original Message-----
+From: Marc Weber [mailto:marco-oweber@gmx.de]
+Sent: Monday, December 10, 2007 5:03 PM
+To: sales@tritoncia.com
+Subject: teamspeak on nix?
+
+Hello,
+
+nix is very young software distribution system (http://nix.cs.uu.nl/)
+I'd like to ask wether you permit us to add teamspeak (server/ client?)
+
+Sincerly
+Marc Weber (small nix contributor)

pkgs/applications/networking/instant-messengers/teamspeak/server.nix

@@ -59,43 +59,9 @@ in stdenv.mkDerivation rec {
     description = "TeamSpeak voice communication server";
     homepage = "https://teamspeak.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [ arobyn gerschtli ];
   };
 }
-
-/*
-License issues:
-Date: Mon, 10 Dec 2007 19:55:16 -0500
-From: TeamSpeak Sales <sales@tritoncia.com>
-To: 'Marc Weber' <marco-oweber@gmx.de>
-Subject: RE: teamspeak on nix?
-
-Yes, that would be fine.  As long as you are not renting servers or selling
-TeamSpeak then you are more than welcome to distribute it.
-
-Thank you,
-
-TeamSpeak Sales Team
-________________________________
-e-Mail: sales@tritoncia.com
-TeamSpeak: http://www.TeamSpeak.com
-Account Login: https://sales.TritonCIA.com/users
-
-
-
------Original Message-----
-From: Marc Weber [mailto:marco-oweber@gmx.de]
-Sent: Monday, December 10, 2007 5:03 PM
-To: sales@tritoncia.com
-Subject: teamspeak on nix?
-
-Hello,
-
-nix is very young software distribution system (http://nix.cs.uu.nl/)
-I'd like to ask wether you permit us to add teamspeak (server/ client?)
-
-Sincerly
-Marc Weber (small nix contributor)
-*/

pkgs/applications/networking/p2p/qbittorrent/default.nix

@@ -28,15 +28,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "qbittorrent"
-    + lib.optionalString (guiSupport && qtVersion == "5") "-qt5"
     + lib.optionalString (!guiSupport) "-nox";
-  version = "4.6.7";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qBittorrent";
     rev = "release-${version}";
-    hash = "sha256-vUC8YIuyoGnl46FajfJG/XFXG+2lM9EaHWl2Hfo3T7c=";
+    hash = "sha256-iwqJaRfwJTL6SimWTNqqqFPXxSKrgo6whYY70llZyGs";
   };
 
   nativeBuildInputs = [
@@ -62,9 +61,7 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  cmakeFlags = lib.optionals (qtVersion == "6") [
+  cmakeFlags = lib.optionals (!guiSupport) [
-    "-DQT6=ON"
-  ] ++ lib.optionals (!guiSupport) [
     "-DGUI=OFF"
     "-DSYSTEMD=ON"
     "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system"

pkgs/applications/science/biology/EZminc/default.nix

@@ -1,30 +1,60 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk, fftwFloat, gsl }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  perl,
+  libminc,
+  bicpl,
+  itk_5_2,
+  fftwFloat,
+  gsl,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "EZminc";
-  version = "unstable-2019-03-12";
+  version = "2.2.00-unstable-2023-10-06";
 
   src = fetchFromGitHub {
-    owner  = "BIC-MNI";
+    owner = "BIC-MNI";
-    repo   = pname;
+    repo = "EZminc";
-    rev    = "5e3333ee356f914d34d66d33ea8df809c7f7fa51";
+    rev = "5fdf112e837000d155891e423041d7065ea13c3f";
-    sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4";
+    hash = "sha256-0KdFIWRHnIHrau0ysGMVpg3oz01UdIvna1y2I4YEWJw=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  postPatch = ''
-  buildInputs = [ itk libminc bicpl fftwFloat gsl ];
+    patchShebangs scripts/*
+  '';
 
-  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
+  nativeBuildInputs = [
-                 "-DEZMINC_BUILD_TOOLS=TRUE"
+    cmake
-                 "-DEZMINC_BUILD_MRFSEG=TRUE"
+    pkg-config
-                 "-DEZMINC_BUILD_DD=TRUE" ];
+  ];
 
-  meta = with lib; {
+  buildInputs = [
-    homepage = "https://github.com/BIC-MNI/${pname}";
+    itk_5_2
+    libminc
+    bicpl
+    fftwFloat
+    gsl
+    perl
+  ];
+
+  cmakeFlags = [
+    "-DLIBMINC_DIR=${libminc}/lib/cmake"
+    "-DEZMINC_BUILD_TOOLS=TRUE"
+    "-DEZMINC_BUILD_MRFSEG=TRUE"
+    # "-DEZMINC_BUILD_DD=TRUE" # numerous compilation issues
+  ];
+
+  doCheck = false; # test programs/data exist but no actual test harness
+
+  meta = {
+    homepage = "https://github.com/BIC-MNI/EZminc";
     description = "Collection of Perl and shell scripts for processing MINC files";
-    maintainers = with maintainers; [ bcdarwin ];
+    maintainers = with lib.maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.linux; # can't detect opengl on Darwin
-    license = licenses.free;
+    license = lib.licenses.free;
-    broken = true;  # ITK5 compatibility issue (https://github.com/BIC-MNI/EZminc/issues/15)
   };
-}
+})

pkgs/applications/virtualization/xen/generic/default.nix

@@ -25,7 +25,7 @@ versionDefinition:
   ncurses,
   ocamlPackages,
   perl,
-  python311Packages,
+  python3Packages,
   systemdMinimal,
   xz,
   yajl,
@@ -323,6 +323,7 @@ stdenv.mkDerivation (finalAttrs: {
     "doc" # The full Xen documentation in HTML format.
     "dev" # Development headers.
     "boot" # xen.gz kernel, policy file if Flask is enabled, xen.efi if EFI is enabled.
+    # TODO: Python package to be in separate output/package.
   ];
 
   # Main Xen source.
@@ -345,10 +346,11 @@ stdenv.mkDerivation (finalAttrs: {
       flex
       pandoc
       pkg-config
+      python3Packages.setuptools
     ]
     ++ lib.lists.optionals withInternalQEMU [
       ninja
-      python311Packages.sphinx
+      python3Packages.sphinx
     ];
   buildInputs =
     [
@@ -362,7 +364,7 @@ stdenv.mkDerivation (finalAttrs: {
       lzo
       ncurses
       perl
-      python311Packages.python
+      python3Packages.python
       xz
       yajl
       zlib
@@ -373,7 +375,7 @@ stdenv.mkDerivation (finalAttrs: {
       ocamlPackages.ocaml
 
       # Python Fixes
-      python311Packages.wrapPython
+      python3Packages.wrapPython
     ]
     ++ lib.lists.optionals withInternalQEMU [
       glib

pkgs/applications/virtualization/xen/packages.nix

@@ -1,6 +1,12 @@
-{ callPackage }:
+{
+  python3Packages,
+  python311Packages,
+  callPackage,
+}:
 let
   standard = {
+    # Broken with python 3.12+ when using internal QEMU due to https://github.com/NixOS/nixpkgs/issues/253751
+    python3Packages = python311Packages;
     meta = {
       description = "Standard";
       longDescription = ''
@@ -13,6 +19,7 @@ let
     };
   };
   slim = {
+    inherit python3Packages;
     meta = {
       description = "Without Internal Components";
       longDescription = ''
@@ -27,30 +34,38 @@ let
 in
 # TODO: generalise this to automatically generate both Xen variants for each ./<version>/default.nix.
 rec {
-  xen_4_19 = callPackage ./4.19/default.nix { inherit (standard) meta; };
+  xen_4_19 = callPackage ./4.19/default.nix {
+    inherit (standard) meta python3Packages;
+  };
   xen_4_19-slim = xen_4_19.override {
     withInternalQEMU = false;
     withInternalSeaBIOS = false;
     withInternalOVMF = false;
     withInternalIPXE = false;
-    inherit (slim) meta;
+    inherit (slim) meta python3Packages;
   };
 
-  xen_4_18 = callPackage ./4.18/default.nix { inherit (standard) meta; };
+  xen_4_18 = callPackage ./4.18/default.nix {
+    inherit (standard) meta python3Packages;
+  };
   xen_4_18-slim = xen_4_18.override {
     withInternalQEMU = false;
     withInternalSeaBIOS = false;
     withInternalOVMF = false;
     withInternalIPXE = false;
-    inherit (slim) meta;
+    inherit (slim) meta python3Packages;
   };
 
-  xen_4_17 = callPackage ./4.17/default.nix { inherit (standard) meta; };
+  xen_4_17 = callPackage ./4.17/default.nix {
+    inherit (standard) meta python3Packages;
+  };
   xen_4_17-slim = xen_4_17.override {
     withInternalQEMU = false;
     withInternalSeaBIOS = false;
     withInternalOVMF = false;
     withInternalIPXE = false;
     inherit (slim) meta;
+    # Broken with python 3.12+ due to distutils missing.
+    python3Packages = python311Packages;
   };
 }

pkgs/by-name/as/asm-lsp/package.nix

@@ -1,8 +1,12 @@
-{ lib
+{
-, rustPlatform
+  lib,
-, fetchFromGitHub
+  stdenv,
-, pkg-config
+  rustPlatform,
-, openssl
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  darwin,
+  libiconv,
 }:
 let
   pname = "asm-lsp";
@@ -18,13 +22,14 @@ rustPlatform.buildRustPackage {
     hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ pkg-config ];
-    pkg-config
-  ];
 
-  buildInputs = [
+  buildInputs =
-    openssl
+    [ openssl ]
-  ];
+    ++ lib.optionals stdenv.buildPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.SystemConfiguration
+      libiconv
+    ];
 
   cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw=";
 
@@ -37,8 +42,11 @@ rustPlatform.buildRustPackage {
     description = "Language server for NASM/GAS/GO Assembly";
     homepage = "https://github.com/bergercookie/asm-lsp";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ NotAShelf ];
+    maintainers = with lib.maintainers; [
+      NotAShelf
+      CaiqueFigueiredo
+    ];
     mainProgram = "asm-lsp";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/bo/bochs/package.nix

@@ -1,26 +1,28 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchurl
+  SDL2,
-, SDL2
+  curl,
-, curl
+  darwin,
-, darwin
+  docbook_xml_dtd_45,
-, docbook_xml_dtd_45
+  docbook_xsl,
-, docbook_xsl
+  fetchurl,
-, gtk3
+  gtk3,
-, libGL
+  libGL,
-, libGLU
+  libGLU,
-, libX11
+  libX11,
-, libXpm
+  libXpm,
-, libtool
+  libtool,
-, ncurses
+  ncurses,
-, pkg-config
+  pkg-config,
-, readline
+  readline,
-, wget
+  stdenv,
-, wxGTK32
+  wget,
-, enableSDL2 ? true
+  wxGTK32,
-, enableTerm ? true
+  # Boolean flags
-, enableWx ? !stdenv.hostPlatform.isDarwin
+  enableSDL2 ? true,
-, enableX11 ? !stdenv.hostPlatform.isDarwin
+  enableTerm ? true,
+  enableWx ? !stdenv.hostPlatform.isDarwin,
+  enableX11 ? !stdenv.hostPlatform.isDarwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,98 +41,110 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [
+  buildInputs =
-    curl
+    [
-    readline
+      curl
-    wget
+      readline
-  ] ++ lib.optionals enableSDL2 [
+      wget
-    SDL2
+    ]
-  ] ++ lib.optionals enableTerm [
+    ++ lib.optionals enableSDL2 [
-    ncurses
+      SDL2
-  ] ++ lib.optionals enableWx [
+    ]
-    gtk3
+    ++ lib.optionals enableTerm [
-    wxGTK32
+      ncurses
-  ] ++ lib.optionals enableX11 [
+    ]
-    libGL
+    ++ lib.optionals enableWx [
-    libGLU
+      gtk3
-    libX11
+      wxGTK32
-    libXpm
+    ]
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ++ lib.optionals enableX11 [
-    darwin.libobjc
+      libGL
-  ];
+      libGLU
+      libX11
+      libXpm
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.libobjc
+    ];
 
-  configureFlags = [
+  configureFlags =
-    "--with-rfb=no"
+    [
-    "--with-vncsrv=no"
+      (lib.withFeature false "rfb")
-    "--with-nogui"
+      (lib.withFeature false "vncsrv")
+      (lib.withFeature true "nogui")
 
-    # These will always be "yes" on NixOS
+      # These will always be "yes" on NixOS
-    "--enable-ltdl-install=yes"
+      (lib.enableFeature true "ltdl-install")
-    "--enable-readline=yes"
+      (lib.enableFeature true "readline")
-    "--enable-all-optimizations=yes"
+      (lib.enableFeature true "all-optimizations")
-    "--enable-logging=yes"
+      (lib.enableFeature true "logging")
-    "--enable-xpm=yes"
+      (lib.enableFeature true "xpm")
 
-    # ... whereas these, always "no"!
+      # ... whereas these, always "no"!
-    "--enable-cpp=no"
+      (lib.enableFeature false "cpp")
-    "--enable-instrumentation=no"
+      (lib.enableFeature false "instrumentation")
 
-    "--enable-docbook=no" # Broken - it requires docbook2html
+      (lib.enableFeature false "docbook") # Broken - it requires docbook2html
 
-    # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
+      # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
-    "--enable-3dnow=no"
+      (lib.enableFeature false "3dnow")
-    "--enable-monitor-mwait=no"
+      (lib.enableFeature false "monitor-mwait")
-    "--enable-raw-serial=no"
+      (lib.enableFeature false "raw-serial")
 
-    # These are completely configurable, and they don't depend of external tools
+      # These are completely configurable, and they don't depend of external tools
-    "--enable-a20-pin"
+      (lib.enableFeature true "a20-pin")
-    "--enable-avx"
+      (lib.enableFeature true "avx")
-    "--enable-busmouse"
+      (lib.enableFeature true "busmouse")
-    "--enable-cdrom"
+      (lib.enableFeature true "cdrom")
-    "--enable-clgd54xx"
+      (lib.enableFeature true "clgd54xx")
-    "--enable-configurable-msrs"
+      (lib.enableFeature true "configurable-msrs")
-    "--enable-cpu-level=6" # from 3 to 6
+      (lib.enableFeatureAs true "cpu-level" "6") # from 3 to 6
-    "--enable-debugger" #conflicts with gdb-stub option
+      (lib.enableFeature true "debugger") # conflicts with gdb-stub option
-    "--enable-debugger-gui"
+      (lib.enableFeature true "debugger-gui")
-    "--enable-evex"
+      (lib.enableFeature true "evex")
-    "--enable-fpu"
+      (lib.enableFeature true "fpu")
-    "--enable-gdb-stub=no" # conflicts with debugger option
+      (lib.enableFeature false "gdb-stub") # conflicts with debugger option
-    "--enable-handlers-chaining"
+      (lib.enableFeature true "handlers-chaining")
-    "--enable-idle-hack"
+      (lib.enableFeature true "idle-hack")
-    "--enable-iodebug"
+      (lib.enableFeature true "iodebug")
-    "--enable-large-ramfile"
+      (lib.enableFeature true "large-ramfile")
-    "--enable-largefile"
+      (lib.enableFeature true "largefile")
-    "--enable-pci"
+      (lib.enableFeature true "pci")
-    "--enable-repeat-speedups"
+      (lib.enableFeature true "repeat-speedups")
-    "--enable-show-ips"
+      (lib.enableFeature true "show-ips")
-    "--enable-smp"
+      (lib.enableFeature true "smp")
-    "--enable-vmx=2"
+      (lib.enableFeatureAs true "vmx" "2")
-    "--enable-svm"
+      (lib.enableFeature true "svm")
-    "--enable-trace-linking"
+      (lib.enableFeature true "trace-linking")
-    "--enable-usb"
+      (lib.enableFeature true "usb")
-    "--enable-usb-ehci"
+      (lib.enableFeature true "usb-ehci")
-    "--enable-usb-ohci"
+      (lib.enableFeature true "usb-ohci")
-    "--enable-usb-xhci"
+      (lib.enableFeature true "usb-xhci")
-    "--enable-voodoo"
+      (lib.enableFeature true "voodoo")
-    "--enable-x86-64"
+      (lib.enableFeature true "x86-64")
-    "--enable-x86-debugger"
+      (lib.enableFeature true "x86-debugger")
-  ] ++ lib.optionals enableSDL2 [
+    ]
-    "--with-sdl2"
+    ++ lib.optionals enableSDL2 [
-  ] ++ lib.optionals enableTerm [
+      (lib.withFeature true "sdl2")
-    "--with-term"
+    ]
-  ] ++ lib.optionals enableWx [
+    ++ lib.optionals enableTerm [
-    "--with-wx"
+      (lib.withFeature true "term")
-  ] ++ lib.optionals enableX11 [
+    ]
-    "--with-x"
+    ++ lib.optionals enableWx [
-    "--with-x11"
+      (lib.withFeature true "wx")
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    ]
-    "--enable-e1000"
+    ++ lib.optionals enableX11 [
-    "--enable-es1370"
+      (lib.withFeature true "x")
-    "--enable-ne2000"
+      (lib.withFeature true "x11")
-    "--enable-plugins"
+    ]
-    "--enable-pnic"
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    "--enable-sb16"
+      (lib.enableFeature true "e1000")
-  ];
+      (lib.enableFeature true "es1370")
+      (lib.enableFeature true "ne2000")
+      (lib.enableFeature true "plugins")
+      (lib.enableFeature true "pnic")
+      (lib.enableFeature true "sb16")
+    ];
 
   enableParallelBuilding = true;
 

pkgs/by-name/bo/bower2nix/package.nix

@@ -0,0 +1,44 @@
+{
+  buildNpmPackage,
+  fetchFromGitHub,
+  git,
+  lib,
+  nix,
+  unstableGitUpdater,
+}:
+
+buildNpmPackage rec {
+  pname = "bower2nix";
+  version = "3.2.0-unstable-2024-06-25";
+
+  src = fetchFromGitHub {
+    owner = "rvl";
+    repo = "bower2nix";
+    rev = "b5da44f055c7561ed7a46226b3be0070e07d80e6";
+    hash = "sha256-da+m2UWQ83tW1o0P1qvw35KpsXL/BDTeShg4KxL+7Ck=";
+  };
+
+  npmDepsHash = "sha256-TK1sqF2J/hQuP3bgGA4MolLA7LWWuYNnqf4gDyU154k=";
+
+  npmBuildScript = "prepare";
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        git
+        nix
+      ]
+    }"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+
+  meta = {
+    changelog = "https://github.com/rvl/bower2nix/releases/tag/v${version}";
+    description = "Generate nix expressions to fetch bower dependencies";
+    homepage = "https://github.com/rvl/bower2nix";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "bower2nix";
+    maintainers = [ ];
+  };
+}

pkgs/by-name/ca/cargo-make/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.37.16";
+  version = "0.37.18";
 
   src = fetchFromGitHub {
     owner = "sagiegurari";
     repo = "cargo-make";
     rev = version;
-    hash = "sha256-OC1HzoEb9OyusYGC5jmEC4qW4U3oGApYvpy5XkZttSg=";
+    hash = "sha256-fiS4Z+Ao3DHyIal1GNXsCEgbLy1fsjbOdLcr7jNvhzA=";
   };
 
-  cargoHash = "sha256-voa456NCuOVEcLlJeUD1G3phzLufqfE0R88aYxcd3ew=";
+  cargoHash = "sha256-GyHaVcrrq3v/d1WJmpteGwVkB9mLk+OIRDSkwR+aPMI=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/co/code-cursor/package.nix

@@ -4,18 +4,15 @@
   fetchurl,
   appimageTools,
   makeWrapper,
-  writeShellApplication,
+  writeScript,
-  curl,
-  yq,
-  common-updater-scripts,
 }:
 let
   pname = "cursor";
-  version = "0.41.1";
+  version = "0.41.3";
   appKey = "230313mzl4w4u92";
   src = fetchurl {
-    url = "https://download.todesktop.com/${appKey}/cursor-0.41.1-build-2409189xe3envg5-x86_64.AppImage";
+    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.41.3-build-240925fkhcqg263-x86_64.AppImage";
-    hash = "sha256-9zqktOR5UOMLkKLD1uJ8eNSujWnnyKAN9H8ejrgcfVU=";
+    hash = "sha256-WtfyiNGnUn8g1HR0TQPyn3SMJmjqe+otAYeyokMIO+w=";
   };
   appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in
@@ -46,23 +43,21 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  passthru = {
+  passthru.updateScript = writeScript "update.sh" ''
-    updateScript = lib.getExe (writeShellApplication {
+    #!/usr/bin/env nix-shell
-      name = "update-cursor";
+    #!nix-shell -i bash -p curl yq coreutils gnused common-updater-scripts
-      runtimeInputs = [
+    set -eu -o pipefail
-        curl
+    latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)"
-        yq
+    version="$(echo "$latestLinux" | yq -r .version)"
-        common-updater-scripts
+    filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')"
-      ];
+    url="https://download.todesktop.com/${appKey}/$filename"
-      text = ''
+    currentVersion=$(nix-instantiate --eval -E "with import ./. {}; code-cursor.version or (lib.getVersion code-cursor)" | tr -d '"')
-        set -o errexit
+
-        latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)"
+    if [[ "$version" != "$currentVersion" ]]; then
-        version="$(echo "$latestLinux" | yq -r .version)"
+      hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")")
-        filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')"
+      update-source-version code-cursor "$version" "$hash" "$url" --source-key=src.src
-        update-source-version code-cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src
+    fi
-      '';
+  '';
-    });
-  };
 
   meta = {
     description = "AI-powered code editor built on vscode";

pkgs/by-name/fl/flarectl/package.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "flarectl";
-  version = "0.104.0";
+  version = "0.105.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
     rev = "v${version}";
-    hash = "sha256-XHvWdSqkVEM/0FWkvSZDLEh8W2h8f+12ROrZSgmZS1k=";
+    hash = "sha256-xUITOBXBy5Jt0DFRNffX7sRhAtgUPMEJOHa2SbjM1n0=";
   };
 
   vendorHash = "sha256-KMCwbbDpj4QAgvKLlOPDKSlrDyf+K/tGTMM/GBlvyuc=";

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

@@ -1,35 +1,56 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{
-, autoreconfHook, intltool
+  lib,
-, gtk, pkg-config, flex }:
+  autoreconfHook,
+  fetchFromGitHub,
+  fetchpatch2,
+  flex,
+  gtk3,
+  intltool,
+  pkg-config,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "galculator";
   version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "galculator";
     repo = "galculator";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
-    sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
+    hash = "sha256-XLDQdUGin7b9SgYV1kwMChBF+l0mYc9sAscY4YRZEGA=";
   };
 
   patches = [
     # Pul patch pending upstream inclusion for -fno-common toolchain support:
     #   https://github.com/galculator/galculator/pull/45
-    (fetchpatch {
+    (fetchpatch2 {
       name = "fno-common.patch";
       url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
-      sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
+      hash = "sha256-qVJHcfJTtl0hK8pzSp6MjhYAh1NbIIWr3rBDodIYBvk=";
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
+  nativeBuildInputs = [
-  buildInputs = [ gtk flex ];
+    autoreconfHook
+    flex
+    intltool
+    pkg-config
+  ];
 
-  meta = with lib; {
+  buildInputs = [
-    description = "GTK 2/3 algebraic and RPN calculator";
+    gtk3
+  ];
+
+  # BUG: when set as true, complains with:
+  # configure.in:76: error: possibly undefined macro: AM_GLIB_GNU_GETTEXT
+  strictDeps = false;
+
+  meta = {
+    homepage = "http://galculator.sourceforge.net/";
+    description = "GTK algebraic and RPN calculator";
     longDescription = ''
-      galculator is a GTK 2 / GTK 3 based calculator. Its main features include:
+      galculator is a GTK-based calculator. Its main features include:
 
       - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes;
       - Basic and Scientific Modes
@@ -40,10 +61,9 @@ stdenv.mkDerivation rec {
       - Binary arithmetic of configurable bit length and signedness
       - Quad-precision floating point arithmetic, and 112-bit binary arithmetic
     '';
-    homepage = "http://galculator.sourceforge.net/";
+    license = lib.licenses.gpl2Plus;
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
     mainProgram = "galculator";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    inherit (gtk3.meta) platforms;
   };
-}
+})

pkgs/by-name/gi/gimoji/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gimoji";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "zeenix";
     repo = "gimoji";
     rev = version;
-    hash = "sha256-0mLFrFxMbX9Gl72W3EC7kfXHqDBo5QU+ut+1psntphY=";
+    hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA=";
   };
 
-  cargoHash = "sha256-pKHhYWEF9L0UX9hc2Ga3WOUWzISA8ONwn3rcI9u2/n0=";
+  cargoHash = "sha256-4B+IRYnqwIqkxjRjlxER8O414Zd/8Are4fu1OxA+dWI=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.AppKit

pkgs/by-name/gi/gitlab-ci-ls/package.nix

@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitlab-ci-ls";
-  version = "0.21.2";
+  version = "0.21.3";
   src = fetchFromGitHub {
     owner = "alesbrelih";
     repo = "gitlab-ci-ls";
     rev = "${version}";
-    hash = "sha256-wkL6ko43oWrpyscEpCMuoFamDMJk9+xI3qYOs+DgI8g=";
+    hash = "sha256-3PqGnknP5ilwPCDsD8GwIEamZC24lEnuQhipTo8RDI0=";
   };
 
-  cargoHash = "sha256-H/p29QbCaZRa81g+5eUsG47tUJPVgB1J9zZYY5/n5Vk=";
+  cargoHash = "sha256-c31madEElZpHbzyKHqUDyPW/maVrkNKlldX24Y3iFGQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs =

pkgs/by-name/gl/glasskube/package.nix

@@ -8,12 +8,12 @@
 }:
 
 let
-  version = "0.21.0";
+  version = "0.23.0";
   gitSrc = fetchFromGitHub {
     owner = "glasskube";
     repo = "glasskube";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MRmT7DqD6Tlej5Y/LVr++RcMjWlGA9xFe3FNYgxIPvM=";
+    hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8=";
   };
   web-bundle = buildNpmPackage rec {
     inherit version;
@@ -21,7 +21,7 @@ let
 
     src = gitSrc;
 
-    npmDepsHash = "sha256-246xQz1eI3WmJxSrKe6Q/oUQtZMjpa4mYwOIqSukyo8=";
+    npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI=";
 
     dontNpmInstall = true;
 
@@ -41,7 +41,7 @@ in buildGo123Module rec {
 
   src = gitSrc;
 
-  vendorHash = "sha256-RUUDIPuCxV+JwPLNxLALEmRIJ68XSNPtfwchuAJJYn0=";
+  vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4=";
 
   CGO_ENABLED = 0;
 

pkgs/by-name/ho/home-manager/package.nix

@@ -18,14 +18,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2024-09-21";
+  version = "0-unstable-2024-09-26";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "14929f7089268481d86b83ed31ffd88713dcd415";
+    rev = "ffe2d07e771580a005e675108212597e5b367d2d";
-    hash = "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=";
+    hash = "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ji/jira-cli-go/package.nix

@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "jira-cli-go";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "ankitpokhrel";
     repo = "jira-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs=";
+    hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo=";
   };
 
-  vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao=";
+  vendorHash = "sha256-a11ZO/iV/Yhaq/cu504p2C/OkKJ04PeMMSoHrl7edvM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/la/labwc-tweaks-gtk/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2024-05-22";
+  version = "0-unstable-2024-09-30";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc-tweaks-gtk";
-    rev = "485961aaaaa3c0158b6b31efd6e504db3c58dc27";
+    rev = "19ae222b6bab778d0f8a900d39c25ab020e33631";
-    hash = "sha256-+X/inkxVPN26AYMqtq3uvfGPlVVhxQpEtF1A9uYAmfY=";
+    hash = "sha256-coA8gU2AKeHs6OENxBWholk5sEL/oketxNFLd8M1kTM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/le/lefthook/package.nix

@@ -6,7 +6,7 @@
 
 let
   pname = "lefthook";
-  version = "1.7.16";
+  version = "1.7.17";
 in
 buildGoModule {
   inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-SAFrtiSISW5QhFq9fow0CA5qvBY1RIfzZGvvfhOqxbY=";
+    hash = "sha256-r7Tss0NHdEfjfDunWSTxpaV1B5KHGYu0xj9nnyhk8tQ=";
   };
 
   vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU=";

pkgs/by-name/ma/matrix-hebbot/package.nix

@@ -0,0 +1,67 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  rustPlatform,
+  pkg-config,
+  cmake,
+  openssl,
+  autoconf,
+  automake,
+  darwin,
+  unstableGitUpdater,
+  sqlite,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hebbot";
+  version = "2.1-unstable-2024-09-20";
+
+  src = fetchFromGitHub {
+    owner = "haecker-felix";
+    repo = "hebbot";
+    rev = "4c7152a3ce88ecfbac06f823abd4fd849e0c30d1";
+    hash = "sha256-y+KpxiEzVAggFoPvTOy0IEmAo2V6mOpM0VzEScUOtsM=";
+  };
+
+  cargoHash = "sha256-7AEWQIUHpeK4aNFzzU10YeJErD0fJ6yQSHwFe4utOFo=";
+
+  nativeBuildInputs =
+    [
+      pkg-config
+      cmake
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      autoconf
+      automake
+    ];
+
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];
+
+  env = {
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  NIX_CFLAGS_LINK = [
+    "-L${lib.getLib openssl}/lib"
+    "-L${lib.getLib sqlite}/lib"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Matrix bot which can generate \"This Week in X\" like blog posts ";
+    homepage = "https://github.com/haecker-felix/hebbot";
+    changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}";
+    license = with lib.licenses; [ agpl3Only ];
+    mainProgram = "hebbot";
+    maintainers = with lib.maintainers; [ a-kenji ];
+  };
+}

pkgs/by-name/nd/ndn-cxx/package.nix

@@ -1,14 +1,15 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitHub
+  stdenv,
-, doxygen
+  fetchFromGitHub,
-, pkg-config
+  doxygen,
-, python3
+  pkg-config,
-, python3Packages
+  python3,
-, wafHook
+  python3Packages,
-, boost179
+  wafHook,
-, openssl
+  boost,
-, sqlite
+  openssl,
+  sqlite,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,18 +19,28 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "named-data";
     repo = "ndn-cxx";
-    rev = "${pname}-${version}";
+    rev = "ndn-cxx-${version}";
     sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM=";
   };
 
-  nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
+  nativeBuildInputs = [
+    doxygen
+    pkg-config
+    python3
+    python3Packages.sphinx
+    wafHook
+  ];
 
-  buildInputs = [ boost179 openssl sqlite ];
+  buildInputs = [
+    boost
+    openssl
+    sqlite
+  ];
 
   wafConfigureFlags = [
     "--with-openssl=${openssl.dev}"
-    "--boost-includes=${boost179.dev}/include"
+    "--boost-includes=${boost.dev}/include"
-    "--boost-libs=${boost179.out}/lib"
+    "--boost-libs=${boost.out}/lib"
     "--with-tests"
   ];
 
@@ -58,6 +69,9 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.lgpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ sjmackenzie bertof ];
+    maintainers = with maintainers; [
+      sjmackenzie
+      bertof
+    ];
   };
 }

pkgs/by-name/nd/ndn-tools/package.nix

@@ -1,39 +1,37 @@
-{ lib
+{
-, stdenv
+  lib,
-, boost
+  stdenv,
-, fetchFromGitHub
+  boost ? ndn-cxx.boost,
-, libpcap
+  fetchFromGitHub,
-, ndn-cxx
+  libpcap,
-, openssl
+  ndn-cxx,
-, pkg-config
+  openssl,
-, sphinx
+  pkg-config,
-, wafHook
+  sphinx,
+  wafHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ndn-tools";
-  version = "22.12";
+  version = "24.07";
 
   src = fetchFromGitHub {
     owner = "named-data";
-    repo = pname;
+    repo = "ndn-tools";
     rev = "ndn-tools-${version}";
-    sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8=";
+    sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w=";
   };
 
-  # Hacky workaround for new pcap-config.
+  nativeBuildInputs = [
-  postPatch = ''
+    pkg-config
-    patch -p1 <<EOF
+    sphinx
-      --- a/tools/dump/wscript
+    wafHook
-      +++ b/tools/dump/wscript
+  ];
-      @@ -5 +5 @@
+  buildInputs = [
-      -    conf.check_cfg(package='libpcap', uselib_store='PCAP',
+    libpcap
-      +    conf.check_cfg(package="", uselib_store='PCAP',
+    ndn-cxx
-    EOF
+    openssl
-  '';
+  ];
-
-  nativeBuildInputs = [ pkg-config sphinx wafHook ];
-  buildInputs = [ libpcap ndn-cxx openssl ];
 
   wafConfigureFlags = [
     "--boost-includes=${boost.dev}/include"

pkgs/by-name/nf/nfd/package.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  boost,
+  fetchFromGitHub,
+  libpcap,
+  ndn-cxx,
+  openssl,
+  pkg-config,
+  sphinx,
+  systemd,
+  wafHook,
+  websocketpp,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  withWebSocket ? true,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nfd";
+  version = "24.07";
+
+  src = fetchFromGitHub {
+    owner = "named-data";
+    repo = "NFD";
+    rev = "NFD-${version}";
+    hash = "sha256-HbKPO3gwQWOZf4QZE+N7tAiqsNl1GrcwE4EUGjWmf5s=";
+  };
+
+  prePatch = lib.optional withWebSocket ''
+    ln -s ${websocketpp}/include/websocketpp websocketpp
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    sphinx
+    wafHook
+  ];
+  buildInputs = [
+    libpcap
+    ndn-cxx
+    openssl
+  ] ++ lib.optional withWebSocket websocketpp ++ lib.optional withSystemd systemd;
+  wafConfigureFlags = [
+    "--boost-includes=${boost.dev}/include"
+    "--boost-libs=${boost.out}/lib"
+  ] ++ lib.optional (!withWebSocket) "--without-websocket";
+
+  meta = with lib; {
+    homepage = "https://named-data.net/";
+    description = "Named Data Networking (NDN) Forwarding Daemon";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bertof ];
+  };
+}

pkgs/by-name/no/nomnatong/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nomnatong";
-  version = "5.11";
+  version = "5.12";
 
   src = fetchFromGitHub {
     owner = "nomfoundation";
     repo = "font";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LaMggMZIehQynA6tokOte28bbV3H0kagJRsbE8ZczsM=";
+    hash = "sha256-DMKL5a830V07U4Pogp2EQtGQUJ26d3F4u7ce5aWPAI8=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/nu/nuclei-templates/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.0.0";
+  version = "10.0.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FGhq1KgHvHkyBXAWdG3OBuNJHj+epLeRw+T241bUSeY=";
+    hash = "sha256-unQ/c3S1uJGSE7DoDsKnnI0n7YGe7s8F0g+yUNB4xH4=";
   };
 
   installPhase = ''

pkgs/by-name/oh/oh-my-posh/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "23.14.1";
+  version = "23.15.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-yOp4DnPfigdpz32/78w+pjFXpsXEAK9N4Bvv2tmT6iI=";
+    hash = "sha256-gZCR7cDSI0gRaTnYADOLpyHe26URo27JXJjnNxr4Jwc=";
   };
 
   vendorHash = "sha256-EBLfbdTV15wSTOThzBY0d2KrSJzRaB8vNH53Uwc+XfM=";

pkgs/by-name/pg/pgmoneta/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmoneta";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
     rev = version;
-    hash = "sha256-iAAL9aPoehRSVPLzeBN2KaeF+p+2T8tHvG+ouJ9YU6k=";
+    hash = "sha256-gB6iArOYwOh8UPGl4x5Tf3H2FSxSXxpfKrwvgmtFFcs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/qu/quickjs-ng/package.nix

@@ -1,23 +1,30 @@
-{ lib
+{
-, stdenv
+  lib,
-, cmake
+  cmake,
-, fetchFromGitHub
+  fetchFromGitHub,
-, testers
+  stdenv,
-, texinfo
+  testers,
+  texinfo,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs-ng";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "quickjs-ng";
     repo = "quickjs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gULpJhOOmhzq2Ydl4soNBiiONtdt2T4sgcSqIBCo3SM=";
+    hash = "sha256-7IAkmlzgiPVd8yRv7LU5a7HWCB+eQk1Ur1KwZupwty0=";
   };
 
-  outputs = [ "bin" "out" "dev" "doc" "info" ];
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "doc"
+    "info"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -25,18 +32,28 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic)
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+  env.NIX_CFLAGS_COMPILE = toString (
-    "-Wno-error=stringop-overflow"
+    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-  ]);
+      "-Wno-error=stringop-overflow"
+    ]
+  );
+
+  strictDeps = true;
+
+  postBuild = ''
+    pushd ../doc
+    makeinfo *texi
+    popd
+  '';
 
   postInstall = ''
-    (cd ../doc
+    pushd ../doc
-     makeinfo --output quickjs.info quickjs.texi
+    install -Dm644 -t ''${!outputInfo}/share/info *info
-     install -Dt $info/share/info/ quickjs.info)
+    popd
   '';
 
   passthru.tests = {
@@ -46,12 +63,12 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
-    description = "Mighty JavaScript engine";
     homepage = "https://github.com/quickjs-ng/quickjs";
-    license = licenses.mit;
+    description = "Mighty JavaScript engine";
-    maintainers = [ ];
+    license = lib.licenses.mit;
-    platforms = platforms.all;
     mainProgram = "qjs";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.all;
   };
 })

pkgs/by-name/qu/quickjs/package.nix

@@ -1,62 +1,130 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchurl
+  fetchurl,
-, texinfo
+  stdenv,
+  testers,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs";
   version = "2024-01-13";
 
   src = fetchurl {
-    url = "https://bellard.org/quickjs/quickjs-${version}.tar.xz";
+    url = "https://bellard.org/quickjs/quickjs-${finalAttrs.version}.tar.xz";
     hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM=";
   };
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  outputs = [
-    substituteInPlace Makefile --replace "CONFIG_LTO=y" ""
+    "out"
-  '';
+    "info"
-
+  ];
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-  enableParallelBuilding = true;
 
   nativeBuildInputs = [
     texinfo
   ];
 
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  doInstallCheck = true;
+
+  enableParallelBuilding = true;
+
+  strictDeps = true;
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile \
+      --replace "CONFIG_LTO=y" ""
+  '';
+
   postBuild = ''
-    (cd doc
+    pushd doc
-     makeinfo *texi)
+    makeinfo *texi
+    popd
   '';
 
   postInstall = ''
-    (cd doc
+    pushd doc
-     install -Dt $out/share/doc *texi *info)
+    install -Dm644 -t ''${!outputInfo}/share/info *info
+    popd
   '';
 
-  doInstallCheck = true;
+  installCheckPhase = lib.concatStringsSep "\n" [
-  installCheckPhase = ''
+    ''
-    PATH="$out/bin:$PATH"
+      runHook preInstallCheck
+    ''
 
+    ''
+      PATH="$out/bin:$PATH"
+    ''
     # Programs exit with code 1 when testing help, so grep for a string
-    set +o pipefail
+    ''
-    qjs     --help 2>&1 | grep "QuickJS version"
+      set +o pipefail
-    qjscalc --help 2>&1 | grep "QuickJS version"
+      qjs     --help 2>&1 | grep "QuickJS version"
-    set -o pipefail
+      qjscalc --help 2>&1 | grep "QuickJS version"
+      set -o pipefail
+    ''
 
-    temp=$(mktemp).js
+    ''
-    echo "console.log('Output from compiled program');" > "$temp"
+      temp=$(mktemp).js
-    set -o verbose
+      echo "console.log('Output from compiled program');" > "$temp"
-    out=$(mktemp) && qjsc         -o "$out" "$temp" && "$out" | grep -q "Output from compiled program"
+      set -o verbose
-    out=$(mktemp) && qjsc   -flto -o "$out" "$temp" && "$out" | grep -q "Output from compiled program"
+      out=$(mktemp) && qjsc       -o "$out" "$temp" && "$out" | grep -q "Output from compiled program"
-  '';
+      out=$(mktemp) && qjsc -flto -o "$out" "$temp" && "$out" | grep -q "Output from compiled program"
+    ''
 
-  meta = with lib; {
+    ''
-    description = "Small and embeddable Javascript engine";
+      runHook postInstallCheck
-    homepage = "https://bellard.org/quickjs/";
+    ''
-    maintainers = with maintainers; [ stesie AndersonTorres ];
+  ];
-    platforms = platforms.unix;
+
-    license = licenses.mit;
+  passthru.tests = {
-    mainProgram = "qjs";
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "qjs --help || true";
+    };
   };
-}
+
+  meta = {
+    homepage = "https://bellard.org/quickjs/";
+    description = "Small and embeddable Javascript engine";
+    longDescription = ''
+       QuickJS is a small and embeddable Javascript engine. It supports the
+       ES2023 specification including modules, asynchronous generators, proxies
+       and BigInt.
+
+       It optionally supports mathematical extensions such as big decimal
+       floating point numbers (BigDecimal), big binary floating point numbers
+       (BigFloat) and operator overloading.
+
+       Main Features:
+
+       - Small and easily embeddable: just a few C files, no external
+         dependency, 210 KiB of x86 code for a simple hello world program.
+       - Fast interpreter with very low startup time: runs the 76000 tests of
+         the ECMAScript Test Suite in less than 2 minutes on a single core of a
+         desktop PC. The complete life cycle of a runtime instance completes in
+         less than 300 microseconds.
+       - Almost complete ES2023 support including modules, asynchronous
+         generators and full Annex B support (legacy web compatibility).
+       - Passes nearly 100% of the ECMAScript Test Suite tests when selecting
+         the ES2023 features. A summary is available at Test262 Report.
+       - Can compile Javascript sources to executables with no external dependency.
+       - Garbage collection using reference counting (to reduce memory usage and
+         have deterministic behavior) with cycle removal.
+       - Mathematical extensions: BigDecimal, BigFloat, operator overloading,
+         bigint mode, math mode.
+       - Command line interpreter with contextual colorization implemented in
+         Javascript.
+       - Small built-in standard library with C library wrappers.
+
+    '';
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      stesie
+      AndersonTorres
+    ];
+    mainProgram = "qjs";
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/sm/smassh/package.nix

@@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec {
   passthru.tests.version = testers.testVersion {
     package = smassh;
     command = "HOME=$(mktemp -d) smassh --version";
+    version = "smassh - v${version}";
   };
 
   meta = with lib; {

pkgs/by-name/te/tetrio-desktop/package.nix

@@ -1,21 +1,21 @@
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchzip
+  lib,
-, dpkg
+  fetchzip,
-, makeWrapper
+  dpkg,
-, callPackage
+  makeWrapper,
-, addDriverRunpath
+  addDriverRunpath,
-, electron
+  electron,
-, withTetrioPlus ? false
+  withTetrioPlus ? false,
-, tetrio-plus ? null
+  tetrio-plus,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tetrio-desktop";
-  version = "9.0.0";
+  version = "9";
 
   src = fetchzip {
-    url = "https://tetr.io/about/desktop/builds/${lib.versions.major finalAttrs.version}/TETR.IO%20Setup.deb";
+    url = "https://tetr.io/about/desktop/builds/${finalAttrs.version}/TETR.IO%20Setup.deb";
     hash = "sha256-TgegFy+sHjv0ILaiLO1ghyUhKXoj8v43ACJOJhKyI0c=";
     nativeBuildInputs = [ dpkg ];
   };
@@ -26,20 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase =
     let
-      tetrio-plus' =
+      asarPath = if withTetrioPlus then tetrio-plus else "opt/TETR.IO/resources/app.asar";
-        if tetrio-plus == null
-        then
-          callPackage ./tetrio-plus.nix
-            {
-              tetrio-src = finalAttrs.src;
-              tetrio-version = finalAttrs.version;
-            }
-        else tetrio-plus;
-
-      asarPath =
-        if withTetrioPlus
-        then "${tetrio-plus'}/app.asar"
-        else "opt/TETR.IO/resources/app.asar";
     in
     ''
       runHook preInstall
@@ -59,22 +46,25 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \
       --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
       --add-flags $out/share/TETR.IO/app.asar
   '';
 
   meta = {
     changelog = "https://tetr.io/about/desktop/history/";
-    description = "TETR.IO desktop client";
+    description = "Desktop client for TETR.IO, an online stacker game";
     downloadPage = "https://tetr.io/about/desktop/";
     homepage = "https://tetr.io";
     license = lib.licenses.unfree;
     longDescription = ''
-      TETR.IO is a modern yet familiar online stacker.
+      TETR.IO is a free-to-win modern yet familiar online stacker.
-      Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours!
+      Play multiplayer games against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours!
     '';
     mainProgram = "tetrio";
-    maintainers = with lib.maintainers; [ wackbyte huantian ];
+    maintainers = with lib.maintainers; [
+      wackbyte
+      huantian
+    ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
   };

pkgs/by-name/te/tetrio-plus/package.nix

@@ -1,44 +1,32 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitLab
+  stdenv,
-, rustPlatform
+  fetchFromGitLab,
-, rustc
+  rustPlatform,
-, wasm-pack
+  rustc,
-, wasm-bindgen-cli
+  wasm-pack,
-, binaryen
+  wasm-bindgen-cli,
+  binaryen,
 
-, fetchYarnDeps
+  fetchYarnDeps,
-, yarn
+  yarn,
-, fixup-yarn-lock
+  fixup-yarn-lock,
-, nodejs
+  nodejs,
-, asar
+  asar,
 
-, tetrio-src
+  tetrio-desktop,
-, tetrio-version
 }:
 
 let
   version = "0.27.2";
+  rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}";
 
   src = fetchFromGitLab {
     owner = "UniQMG";
     repo = "tetrio-plus";
-    rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}";
+    inherit rev;
-    hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw=";
+    hash = "sha256-pcT8/YsfHeimSkeNziW9ha63hEgCg2vnvJSZAY1c7P0=";
     fetchSubmodules = true;
-
-    # tetrio-plus uses this info for displaying its version,
-    # so we need to deep clone to have all the revision history.
-    # After we're done, we emulate 'leaveDotGit = false' by removing
-    # all the .git folders.
-    leaveDotGit = true;
-    deepClone = true;
-    postFetch = ''
-      cd "$out"
-      git rev-parse --short HEAD~1 > resources/ci-commit-previous
-      git rev-parse --short HEAD > resources/ci-commit
-      find "$out" -name .git -print0 | xargs -0 rm -rf
-    '';
   };
 
   wasm-bindgen-82 = wasm-bindgen-cli.override {
@@ -76,7 +64,10 @@ let
       description = "Self contained toolkit for creating, editing, and previewing TPSE files";
       homepage = "https://gitlab.com/UniQMG/tpsecore";
       license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ huantian wackbyte ];
+      maintainers = with lib.maintainers; [
+        huantian
+        wackbyte
+      ];
       platforms = lib.platforms.linux;
     };
   };
@@ -101,13 +92,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    # 'out' is the directory that the tetrio-plus expects the vanilla asar to be
+    # tetrio-plus expects the vanilla asar to be extracted into 'out' and
-    # and this is the directory that will contain the final result that we want
+    # 'out' is the directory contianing the final patched asar's contents
-    asar extract ${tetrio-src}/opt/TETR.IO/resources/app.asar out
+    asar extract ${tetrio-desktop.src}/opt/TETR.IO/resources/app.asar out
-    cd out
 
     # Install custom package.json/yarn.lock that describe the additional node
     # dependencies that tetrio-plus needs to run, and install them in our output
+    cd out
+
     cp ../resources/desktop-ci/yarn.lock .
     patch package.json ../resources/desktop-ci/package.json.diff
 
@@ -119,24 +111,26 @@ stdenv.mkDerivation (finalAttrs: {
 
     cd ..
 
-    # The simple build script expects the vanilla asar located here
+    # The included build script expects the vanilla asar located here
     # This patches the vanilla code to load the tetrio-plus code
-    ln -s ${tetrio-src}/opt/TETR.IO/resources/app.asar app.asar
+    ln -s ${tetrio-desktop.src}/opt/TETR.IO/resources/app.asar app.asar
     node ./scripts/build-electron.js
 
-    # Finally, we install the tetrio-plus code where the above patch script expects
+    # Actually install tetrio-plus where the above patch script expects
     cp -r $src out/tetrioplus
     chmod -R u+w out/tetrioplus
 
-    # Disable the uninstall button in the tetrio-plus popup,
+    # Install tpsecore
-    # as it doesn't make sense to mutably uninstall it in a nix package
+    cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/
+    # Remove uneeded tpsecore source code
+    rm -rf out/tetrioplus/tpsecore/
+
+    # Disable useless uninstall button in the tetrio-plus popup
     substituteInPlace out/tetrioplus/desktop-manifest.js \
       --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false'
 
-    # We don't need the tpsecore source code bundled
+    # Display 'nixpkgs' next to version in tetrio-plus popup
-    rm -rf out/tetrioplus/tpsecore/
+    echo "nixpkgs" > out/tetrioplus/resources/override-commit
-    # since we install the compiled version here
-    cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/
 
     runHook postBuild
   '';
@@ -144,23 +138,29 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preinstall
 
-    mkdir -p $out
+    asar pack out $out
-    asar pack out $out/app.asar
 
     runHook postinstall
   '';
 
   meta = {
-    description = "TETR.IO customization tool suite";
+    description = "Modified TETR.IO desktop app.asar with many customization tools";
-    downloadPage = "https://gitlab.com/UniQMG/tetrio-plus/-/releases";
+    longDescription = ''
+      To use this, `override` the `withTetrioPlus` attribute of `tetrio-desktop`.
+    '';
     homepage = "https://gitlab.com/UniQMG/tetrio-plus";
+    downloadPage = "https://gitlab.com/UniQMG/tetrio-plus/-/releases";
+    changelog = "https://gitlab.com/UniQMG/tetrio-plus/-/releases/${rev}";
     license = [
       lib.licenses.mit
       # while tetrio-plus is itself mit, the result of this derivation
       # is a modified version of tetrio-desktop, which is unfree.
       lib.licenses.unfree
     ];
-    maintainers = with lib.maintainers; [ huantian wackbyte ];
+    maintainers = with lib.maintainers; [
+      huantian
+      wackbyte
+    ];
     platforms = lib.platforms.linux;
   };
 })

pkgs/by-name/ty/typos/package.nix

@@ -1,4 +1,8 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
@@ -18,7 +22,13 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "typos";
     homepage = "https://github.com/crate-ci/typos";
     changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [ asl20 /* or */ mit ];
+    license = with licenses; [
-    maintainers = with maintainers; [ figsoda mgttlinger ];
+      asl20 # or
+      mit
+    ];
+    maintainers = with maintainers; [
+      figsoda
+      mgttlinger
+    ];
   };
 }

pkgs/by-name/up/uppaal/package.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  makeWrapper,
+  jdk17,
+  makeDesktopItem,
+  copyDesktopItems,
+  wrapGAppsHook3,
+  shared-mime-info,
+  gdk-pixbuf,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "uppaal";
+  version = "5.0";
+  subversion = "0";
+  platform = "linux64";
+
+  src = fetchzip {
+    url = "https://download.uppaal.org/uppaal-${version}/uppaal-${version}.${subversion}/uppaal-${version}.${subversion}-${platform}.zip";
+    hash = "sha256-o71mP2/sDNRpmA1Qx59cvx6t4pk5pP0lrn1CogN3PuM=";
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "uppaal";
+      exec = "uppaal %U";
+      icon = "uppaal";
+      comment = "real-time modelling and verification tool";
+      desktopName = "Uppaal";
+      genericName = "Uppaal";
+      categories = [ "Development" ];
+    })
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+    wrapGAppsHook3
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    jdk17
+    gdk-pixbuf
+    shared-mime-info
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mkdir -p $out/lib/uppaal
+    for size in 16 32 48 64 96 128; do
+      install -Dm444 res/icon-"$size"x"$size".png "$out"/share/icons/hicolor/"$size"x"$size"/apps/uppaal.png
+    done
+
+    cp -r * $out/lib/uppaal
+
+    chmod +x $out/lib/uppaal/uppaal
+
+    makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \
+      --set JAVA_HOME ${jdk17} \
+      --set PATH $out/lib/uppaal:$PATH \
+      --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Integrated tool environment for modeling, validation and verification of real-time systems";
+    homepage = "https://uppaal.org/";
+    license = licenses.unfreeRedistributable;
+    platforms = with platforms; linux ++ darwin ++ windows;
+    broken = !(stdenvNoCC.hostPlatform.isLinux && stdenvNoCC.hostPlatform.isx86_64);
+    maintainers = with maintainers; [ mortenmunk ];
+    mainProgram = "uppaal";
+  };
+}

pkgs/by-name/wl/wlx-overlay-s/Cargo.lock

@@ -225,11 +225,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
-version = "0.38.0+1.3.281"
+version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -789,7 +789,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading",
+ "libloading 0.8.5",
 ]
 
 [[package]]
@@ -1264,7 +1264,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading",
+ "libloading 0.8.5",
 ]
 
 [[package]]
@@ -2031,6 +2031,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
 [[package]]
 name = "libloading"
 version = "0.8.5"
@@ -2671,7 +2681,7 @@ version = "0.18.0"
 source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.8.5",
  "ndk-context",
  "openxr-sys",
 ]
@@ -3472,12 +3482,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "slabbin"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8305086044614627ed85432d27b87cf9fc047204eaa036a11de6cf0120f273"
-
 [[package]]
 name = "slice-of-array"
 version = "0.3.2"
@@ -3908,7 +3912,7 @@ dependencies = [
 [[package]]
 name = "vulkano"
 version = "0.34.0"
-source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133"
+source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c"
 dependencies = [
  "ahash",
  "ash",
@@ -3918,17 +3922,16 @@ dependencies = [
  "half",
  "heck 0.4.1",
  "indexmap 2.3.0",
- "libloading",
+ "libloading 0.8.5",
- "nom",
  "objc",
  "once_cell",
  "parking_lot",
  "proc-macro2",
  "quote",
  "raw-window-handle",
+ "regex",
  "serde",
  "serde_json",
- "slabbin",
  "smallvec",
  "thread_local",
  "vk-parse",
@@ -3938,7 +3941,7 @@ dependencies = [
 [[package]]
 name = "vulkano-macros"
 version = "0.34.0"
-source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133"
+source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c"
 dependencies = [
  "proc-macro-crate 2.0.2",
  "proc-macro2",
@@ -3949,7 +3952,7 @@ dependencies = [
 [[package]]
 name = "vulkano-shaders"
 version = "0.34.0"
-source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133"
+source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c"
 dependencies = [
  "ahash",
  "heck 0.4.1",
@@ -4574,7 +4577,7 @@ dependencies = [
 
 [[package]]
 name = "wlx-overlay-s"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "ash",
@@ -4644,7 +4647,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading",
+ "libloading 0.8.5",
  "once_cell",
  "rustix",
  "x11rb-protocol",

pkgs/by-name/wl/wlx-overlay-s/package.nix

@@ -28,13 +28,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wlx-overlay-s";
-  version = "0.5.0";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "galister";
     repo = "wlx-overlay-s";
     rev = "v${version}";
-    hash = "sha256-FuhpHByeiUwB14+WHZ7ssJ8YPphs06jPcMhxiGfiaU8=";
+    hash = "sha256-Gk/3m4eWFZqeQBphBUTGAUqe8SspXqut8n4JM8tTe6o=";
   };
 
   cargoLock = {
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
       "libmonado-rs-0.1.0" = "sha256-ja7OW/YSmfzaQoBhu6tec9v8fyNDknLekE2eY7McLPE=";
       "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";
       "ovr_overlay-0.0.0" = "sha256-5IMEI0IPTacbA/1gibYU7OT6r+Bj+hlQjDZ3Kg0L2gw=";
-      "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc=";
+      "vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8=";
       "wlx-capture-0.3.12" = "sha256-32WnAnNUSfsAA8WB9da3Wqb4acVlXh6HWsY9tPzCHEE=";
     };
   };

pkgs/by-name/ze/zed-editor/Cargo.lock

@@ -14375,7 +14375,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.154.3"
+version = "0.154.4"
 dependencies = [
  "activity_indicator",
  "anyhow",

pkgs/by-name/ze/zed-editor/package.nix

@@ -27,7 +27,7 @@
   makeFontsConf,
   vulkan-loader,
   envsubst,
-  nix-update-script,
+  gitUpdater,
   cargo-about,
   testers,
   zed-editor,
@@ -86,13 +86,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.154.3";
+  version = "0.154.4";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6W4YKtYeLUv1N51YJonb7I2BO4zEESgI8vmMhJVoLDI=";
+    hash = "sha256-/sL5SVRNVJBMPPZek9zBiek3nXHI1czNwbkGtlk9CzU=";
     fetchSubmodules = true;
   };
 
@@ -244,11 +244,9 @@ rustPlatform.buildRustPackage rec {
   '';
 
   passthru = {
-    updateScript = nix-update-script {
+    updateScript = gitUpdater {
-      extraArgs = [
+      rev-prefix = "v";
-        "--version-regex"
+      ignoredVersions = "pre";
-        "v(.*)"
-      ];
     };
     tests.version = testers.testVersion {
       inherit version;

pkgs/data/fonts/iosevka/bin.nix

@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "31.4.0";
+  version = "31.7.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";

pkgs/data/fonts/iosevka/variants.nix

@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "16pyffwwyq9vlwd3xjnfpr5sgcai9kdiz9vsrjws5wr8qr85rc93";
+  Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm";
-  IosevkaAile = "1s1gy1h6xwgn2bkh8z7ghgvr9qccahr36jqbbyksj1lms4sl6zsp";
+  IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1";
-  IosevkaCurly = "0h062xhdskxa0kwj4h73r6ihllmxqkq4qazghf689lkbrklcq9rz";
+  IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb";
-  IosevkaCurlySlab = "053xvjkghbk9s6x492bj9ykx7fn1kz7k7hg55gnmppw0hi8ajfxx";
+  IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b";
-  IosevkaEtoile = "1dinagfkb3vfh2y4bbyk2kgvw1rgw71fyqwb72zd20ygrnwwq4hc";
+  IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg";
-  IosevkaSlab = "0xxz7gr71bry054d6va1kijdk1bh6l9h9cifyfvdyf9h4rrpidjk";
+  IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1";
-  IosevkaSS01 = "0w333v4i7y949cqczp47x36435f8d010bmkmzbf17zf1fwny8bsp";
+  IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw";
-  IosevkaSS02 = "0b75cvfnvrzdbiqvb58xgd6wsmdlm187nj08rs3102gyc0crwzbd";
+  IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl";
-  IosevkaSS03 = "15f3qadgd0xrqr95vbmway0gzwjbwjzz7xf92ql2nhhbxnkfsra4";
+  IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q";
-  IosevkaSS04 = "1xvkmzpzx71c9m615252y1643brlagh04kn1m3c7xx6idxg3fshc";
+  IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c";
-  IosevkaSS05 = "1apwlfggxj98rvz7ndrrs3wszx1sw9mwbqd0khxq1qrr1mq2x07h";
+  IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4";
-  IosevkaSS06 = "0k5g7d87r4jlq55gd07v319v06vmvdcz0qw4kfy5p87r5m1wyv4k";
+  IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj";
-  IosevkaSS07 = "1hd4nxjvasb562qr61nrj1h7mj06r6fdjadjs7jx0ph3qfc2p4rj";
+  IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1";
-  IosevkaSS08 = "0licrfyizc1f5dfb8sfnjzxxxjx6zfxp1fjjwwr7j6vxaxx6pvp1";
+  IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a";
-  IosevkaSS09 = "1qpll64150yrhafgif9fw6nl5mhm8gkdjrzysdfd4vkabzzg21l7";
+  IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l";
-  IosevkaSS10 = "1n7jnwzg0kcpzg13wac0m269z8qsci24jwlsc6i3v94ksil34p3n";
+  IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix";
-  IosevkaSS11 = "0f8gprgcpm56bwmiwa1h2bbgxh3fagcv0gfbwbhnkjmkdr2gp9x6";
+  IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz";
-  IosevkaSS12 = "1vj0lanm0kh5ndsqwvh1hb70hxmy834gbsqx5afr2bqfdv2lbl4k";
+  IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b";
-  IosevkaSS13 = "0n0wvgah0zraqvff68kwvw8m6fzahblp27sag370pk7v0wr4k0wb";
+  IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk";
-  IosevkaSS14 = "0r5x3y8nh9j7nzxcffgkxiyd7hfzi8r95bvbdq7lh6nvaa3a22fy";
+  IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d";
-  IosevkaSS15 = "0ga9jkd4plr3wjmjxl60qaw0w5zdz6w75v065fzpg1q0yxixipd6";
+  IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3";
-  IosevkaSS16 = "0j4mi3yfw6y7863fa413jlyi9yb4j5cgrcibjqbp139282j7bnqk";
+  IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn";
-  IosevkaSS17 = "17m05d2d7d7pvdypzwnsy8yxvsiflm73788msgr7xrvn8l527v1h";
+  IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw";
-  IosevkaSS18 = "1y7a6k9wm59r76w5l9zf1xz4k8w0k19p74d3x0xzfzbrd1swgii1";
+  IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1";
-  SGr-Iosevka = "17ccw94vi1gx2hs61w52zih8l249yw7mwldgpiqcvhfgs3gl2mba";
+  SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57";
-  SGr-IosevkaCurly = "1i1vf0sndib8bfbvzfyr4cb98w1jn961gj58g0qsnrgidhsgrwmi";
+  SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv";
-  SGr-IosevkaCurlySlab = "1danjyxaqs32ln9mq1ns1991d2z9rv64qpvxg2n92j7hmd2ifsay";
+  SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf";
-  SGr-IosevkaFixed = "1aa5905i8rkndgk0dxn7vxzycg7v9ynf8xwznp1wddqmxhfi6n7r";
+  SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md";
-  SGr-IosevkaFixedCurly = "1s5c9f0is4bi9hsp7z74k5l5yc1qibvlx4vzhmphlns3ykyb14f9";
+  SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1";
-  SGr-IosevkaFixedCurlySlab = "1xf8cp3x5al5zc6dn9zf8l5vkcnlmn9g2xk4p244l9d0h3bws7nf";
+  SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d";
-  SGr-IosevkaFixedSlab = "0wdjyy4dvbbh6m5i1lwc4khrjydwkimw98yisfyn9dm81f9y3scn";
+  SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl";
-  SGr-IosevkaFixedSS01 = "0rk6mynlyni6jcf35ppw6iki116j0s5n747lsmqssmr127kdygn5";
+  SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n";
-  SGr-IosevkaFixedSS02 = "0jx6254nyz4c3d0rz19bskxyk0azhqm4qmkph9053r4glysjc2xm";
+  SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc";
-  SGr-IosevkaFixedSS03 = "0y1vavp6h3s1xggd62ar9zbqvnl6dl9fmw7vv4nl5xd08i4mc8wf";
+  SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8";
-  SGr-IosevkaFixedSS04 = "1q1g2psx93x8rf3mcwgh6c0gjzmi965c1nrd3hz4a4zk8h1n6981";
+  SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1";
-  SGr-IosevkaFixedSS05 = "1lbgr8b1904k0i89ad1zkk7xc8ind5hqnjvsg8m88na3wry3gz37";
+  SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb";
-  SGr-IosevkaFixedSS06 = "09ddjb0y02g9l4brn33li3sssll5g9njnqqi05nzdvjsbc3ls3qq";
+  SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva";
-  SGr-IosevkaFixedSS07 = "03aivfwh0bf3c8khpjgds6ajdff2h3q7nvn6b5c86wg30wi024r3";
+  SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms";
-  SGr-IosevkaFixedSS08 = "0skf9nrd3hgxkgjw3rjx5nd3r476jxy083wpzvvvd4ffkjdglcn6";
+  SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y";
-  SGr-IosevkaFixedSS09 = "13vymxhgms68d56ni8arfl8n53r4nlpcv39khgymp28rq8snqh32";
+  SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c";
-  SGr-IosevkaFixedSS10 = "1mlwilxy4k936v6ck9gif18cq9xbwv3da9nbqlaq91nhwpwfhvjw";
+  SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh";
-  SGr-IosevkaFixedSS11 = "0nxgm82w4m58bz7pixbkskvphzcrw3xshnphjb53n1sng7xcdvk4";
+  SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v";
-  SGr-IosevkaFixedSS12 = "1pghgii73y9r5c960a0dg2hqvfpf45z737i8fjnda1a5msrr8as6";
+  SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m";
-  SGr-IosevkaFixedSS13 = "0aab838ah1qjcqmp5d7ys8qxjws4pk5zrmhildisfhappcddmzn9";
+  SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b";
-  SGr-IosevkaFixedSS14 = "0xrz5alr2ll2kq61crlb1jw5c1v80hn4wblj245y96jgj6nckpa4";
+  SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf";
-  SGr-IosevkaFixedSS15 = "0sr1wv00pb85pdkhj4xjnmzgk84ks8h75bmjhn4sm8bahxbss056";
+  SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k";
-  SGr-IosevkaFixedSS16 = "0nap7ckvq23gqn5kr6asm7jjb2l6wmf53k30wvwmrwarqc9nlv1h";
+  SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n";
-  SGr-IosevkaFixedSS17 = "19124ya7j56lxhjmvw4cvqpim4y0j501nkvpnzdlyclbakmg6f6r";
+  SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw";
-  SGr-IosevkaFixedSS18 = "1f2kgpwflqi2fck1qcfidmq9r10arsp26gycj4dkgb71ddasb020";
+  SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x";
-  SGr-IosevkaSlab = "1fzvnivlj4f9k8vgwq1bp1bqh92d069qyymrfq2ki9p6if0jvf79";
+  SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l";
-  SGr-IosevkaSS01 = "0gjbpb7vv4nvvx913kqrkh2l0145l3xlqk589cfa0hdpc5jvc79k";
+  SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd";
-  SGr-IosevkaSS02 = "05dv0n7ziwyyv9rm8vsz71qki632cggcxb5qdrz51a03jhykxx10";
+  SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj";
-  SGr-IosevkaSS03 = "16jb0kf933pkvlkvvj8j6av608x8vyb0v3rmd6y67wb47prk6bh9";
+  SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7";
-  SGr-IosevkaSS04 = "1nyahbag9fkfhv0rw129dcni6iqq8jji7p468rd9diqz05ainlc9";
+  SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx";
-  SGr-IosevkaSS05 = "0cvqcvvqgq0s8mpk9lpypqglvh69ksfyv57r6dilaf329adfp1sw";
+  SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6";
-  SGr-IosevkaSS06 = "13y7aw7xwsbx1igmlvmlw25cq742lwgr40r02scpx39i65lk9baz";
+  SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k";
-  SGr-IosevkaSS07 = "13x8frvbxzzl0rf12n3xpgg66yjrwbavhrb9kix9ngbznahk85qm";
+  SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly";
-  SGr-IosevkaSS08 = "06gsrb3d17672ci8gwj1wmlj3nm1v2qkgjx3gblsh0ykgqqyxqv7";
+  SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3";
-  SGr-IosevkaSS09 = "1xy8wsxlcly3xf7swis4pdm4v5vp684lrsy8z8kn7j2f0l7cy82m";
+  SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs";
-  SGr-IosevkaSS10 = "11bngjjm22lah21xzazn7yfpi433bllwcl3shxpbscm5xcx2hf04";
+  SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c";
-  SGr-IosevkaSS11 = "1z9vkcld1ywnwcg5am5zl30dsrjmvbi14f6gsihxcalncpwzwyhz";
+  SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad";
-  SGr-IosevkaSS12 = "05ivbrf0h7h9g64pbz3xy62v5m97fwpib2l3zg3x9s3xln7r93sd";
+  SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp";
-  SGr-IosevkaSS13 = "0fkv6szha00wlwp1sks0ywdxgzn4y7j1ny5934rllz47s4574vd0";
+  SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf";
-  SGr-IosevkaSS14 = "1r4yzc304ds056d8cxjjfr5hrbf3a0cxaspw9a1hb1d5mr0409v1";
+  SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl";
-  SGr-IosevkaSS15 = "0krz2mscxrzv2gl789ssgz09pmnixg6z0pa8jhsgkws67d0y6m60";
+  SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4";
-  SGr-IosevkaSS16 = "0c20bvzvbrbm1q0nzp5az8jh5zfd5kk4syhpyp0f7fycjzalygxi";
+  SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq";
-  SGr-IosevkaSS17 = "17a4svm25kzmszm6lz3i1ldyphpd98rn6yc2fys1mfblmg7l0jmj";
+  SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m";
-  SGr-IosevkaSS18 = "0lsyvqy4z6zp8bc5sq3gg33lwxpa6vfxc2ajlayc8xvcjyf70lza";
+  SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy";
-  SGr-IosevkaTerm = "023ksvd5d9b6an8vja67b5f2h80gnjmhbab4pqsafm2xrmc6cdpx";
+  SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g";
-  SGr-IosevkaTermCurly = "0ga2vfhpgv9kwg25vcgddsa2rs8hcidbjcqywd8g9yp3jykdkfhm";
+  SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy";
-  SGr-IosevkaTermCurlySlab = "1kkks8n0giwid9f5xfq8b00xzvbpgp9416q1rlnyc91cr7bz3x2m";
+  SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6";
-  SGr-IosevkaTermSlab = "149xqag9sfg5w4cmbagn93mk2088b8r60nal1l4l4dlfm3vnbr61";
+  SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53";
-  SGr-IosevkaTermSS01 = "151vk6abvlmyygk9dd7f7adf7a6279yi90dh1dagzrpfbwx5955g";
+  SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd";
-  SGr-IosevkaTermSS02 = "1qa3vp67jwb7ns44i4i0cdakwpi5pvwqw2ij8zp4iw0229hyz2q9";
+  SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67";
-  SGr-IosevkaTermSS03 = "0mk1bc306mf3j3xh8l7bxa5yq3lida30d5xlbhifks7v1wynh2j5";
+  SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9";
-  SGr-IosevkaTermSS04 = "0r6msfh14s0kmv9y0hyda8ln5iarv2fd2fs8gkwrpyd64nb0bjdg";
+  SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv";
-  SGr-IosevkaTermSS05 = "0qkamr3p0li05ifc1rcsrdsiq5imr30g1y36xj2g1ci6g8biilq1";
+  SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3";
-  SGr-IosevkaTermSS06 = "1gvqqydblfgbb5dm4p6g5rs80669xhic7qz5r5vchg6s1nbyyqq0";
+  SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9";
-  SGr-IosevkaTermSS07 = "08s2zafv9rjq1wbqh7nb7n5x21zgpzxgvkg7fa8dkhsdjdmw4n85";
+  SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv";
-  SGr-IosevkaTermSS08 = "0rp7nckqnfpha17ca7fjy6l3fdfbxxnag8czb859akfcfbqbq5h0";
+  SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5";
-  SGr-IosevkaTermSS09 = "0ry6m079n52xw8im3ifwngzr7ny85rbj5nvvrh5dpnf6mpv878nn";
+  SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4";
-  SGr-IosevkaTermSS10 = "1l2jyjb2whg75gyzsjk52m9489nqqpd5mg95kmkc77na4brix769";
+  SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6";
-  SGr-IosevkaTermSS11 = "117nhhi2nzy2k9fjficqy837frkb03fl17s3ncij6b6d0yrd50jj";
+  SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9";
-  SGr-IosevkaTermSS12 = "1wf1ypnzsxa00akhl5a6c9awdzg7b201ana4im2rii141b85l3d1";
+  SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q";
-  SGr-IosevkaTermSS13 = "1xsxfpxjmcf0fxw5xp8cairplinjb14y6mrfdvj2zh01xbnjryvr";
+  SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf";
-  SGr-IosevkaTermSS14 = "0s4q9wnk734xfa06qvlm8689ilvzjaxfbpnmqv8irqwp4s5pdsyl";
+  SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al";
-  SGr-IosevkaTermSS15 = "0k6sida5ziwq7rn7x6561zcyynki1nlmxp4qwjc20bmym8wi55wf";
+  SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f";
-  SGr-IosevkaTermSS16 = "1vnqsd44zgx1hzp4zjccph5jh8chv7fnijfxnr9cncslmq03y6yn";
+  SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj";
-  SGr-IosevkaTermSS17 = "0cx1dh1icc1h3i4al6rlkzbi70xvq1mzywjzl96r2pa9x4fj71gy";
+  SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf";
-  SGr-IosevkaTermSS18 = "09f9zy9khg4r3qymcki85k26529nn3pgpm4ra5c5zw8bl56yxxhp";
+  SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0";
 }

pkgs/development/compilers/elm/packages/node/default.nix

@@ -6,6 +6,20 @@ let
     inherit pkgs nodejs;
     inherit (pkgs.stdenv.hostPlatform) system;
   };
+  ESBUILD_BINARY_PATH = lib.getExe (
+      pkgs.esbuild.override {
+        buildGoModule = args: pkgs.buildGoModule (args // rec {
+          version = "0.20.2";
+          src = pkgs.fetchFromGitHub {
+            owner = "evanw";
+            repo = "esbuild";
+            rev = "v${version}";
+            hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
+          };
+          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+        });
+      }
+    );
 in
 with self; with elmLib; {
   inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install;
@@ -22,6 +36,7 @@ with self; with elmLib; {
       };
     in
     patched.override (old: {
+      inherit ESBUILD_BINARY_PATH;
       preRebuild = (old.preRebuild or "") + ''
         # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
         # in case of just this package
@@ -124,6 +139,7 @@ with self; with elmLib; {
       patched = patchNpmElm nodePkgs.elm-land;
     in
     patched.override (old: {
+      inherit ESBUILD_BINARY_PATH;
       meta = with lib; nodePkgs."elm-land".meta // {
         description = "Production-ready framework for building Elm applications";
         homepage = "https://elm.land/";

pkgs/development/compilers/elm/packages/node/elm-pages/default.nix

@@ -1,9 +1,29 @@
 { nodePkgs, pkgs, lib, makeWrapper }:
 
-nodePkgs."elm-pages".overrideAttrs (
+let
+  ESBUILD_BINARY_PATH = lib.getExe (
+      pkgs.esbuild.override {
+        buildGoModule = args: pkgs.buildGoModule (args // rec {
+          version = "0.21.5";
+          src = pkgs.fetchFromGitHub {
+            owner = "evanw";
+            repo = "esbuild";
+            rev = "v${version}";
+            hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
+          };
+          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+        });
+      }
+    );
+in nodePkgs."elm-pages".overrideAttrs (
   old: {
+    inherit ESBUILD_BINARY_PATH;
     nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ];
 
+    preRebuild = ''
+      sed -i 's/"esbuild": "0\.19\.12"/"esbuild": "0.21.5"/' package.json
+    '';
+
     # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation;
     # need to patch in one of the build phases instead.
     # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem

pkgs/development/compilers/elm/packages/node/generate-node-packages.sh

@@ -10,3 +10,5 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
     -o node-packages.nix \
     -c node-composition.nix \
     --no-copy-node-env -e ../../../../node-packages/node-env.nix
+# well, elm-pages requires two different version of esbuild so we twist it's wrist to only use one
+sed -i 's/sources."esbuild-0.19.12"/sources."esbuild-0.21.5"/' node-packages.nix

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

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

pkgs/development/compilers/llvm/default.nix

@@ -28,7 +28,7 @@ let
     "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
-    "19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc=";
+    "19.1.1".officialRelease.sha256 = "sha256-xTo44+vH1Bz49fEl4bIpU3eIgQtFuBTGbgU7mzeY33s=";
     "20.0.0-git".gitRelease = {
       rev = "64f2bff12b8ac40c79004ffacf46a5294600d219";
       rev-version = "20.0.0-unstable-2024-09-29";

pkgs/development/libraries/unicorn/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "unicorn";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "unicorn-engine";
     repo = "unicorn";
     rev = "refs/tags/${version}";
-    hash = "sha256-o2syI3kBmofC9OFkUbUFCMpXGL5JlGviCLum+9Bi0LQ=";
+    hash = "sha256-ZlQ2WVTToT0OMxK6brsHnchxDwAR5n1wdtZtkTTgWV4=";
   };
 
   nativeBuildInputs =

pkgs/development/lua-modules/generated-packages.nix

@@ -418,11 +418,11 @@ buildLuarocksPackage {
   version = "2.8-1";
   knownRockspec = (fetchurl {
     url    = "mirror://luarocks/dkjson-2.8-1.rockspec";
-    sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka";
+    hash = "sha256-arasJeX7yQ2Rg70RyepiGNvLdiyQz8Wn4HXrdTEIBBg=";
   }).outPath;
   src = fetchurl {
     url    = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz";
-    sha256 = "0js9z5ja3ws1i9gj2m673459rwm0gadxbf86mcif7d8286h61yh9";
+    hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI=";
   };
 
   disabled = luaOlder "5.1" || luaAtLeast "5.5";

pkgs/development/node-packages/aliases.nix

@@ -63,6 +63,7 @@ mapAliases {
   inherit (pkgs) bash-language-server; # added 2024-06-07
   bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
   bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
+  inherit (pkgs) bower2nix; # added 2024-08-23
   inherit (pkgs) btc-rpc-explorer; # added 2023-08-17
   inherit (pkgs) carbon-now-cli; # added 2023-08-17
   inherit (pkgs) carto; # added 2023-08-17

pkgs/development/node-packages/node-packages.json

@@ -21,7 +21,6 @@
 , "aws-cdk"
 , "awesome-lint"
 , "bower"
-, "bower2nix"
 , "browserify"
 , "browser-sync"
 , "cdk8s-cli"

pkgs/development/node-packages/node-packages.nix

@@ -59113,140 +59113,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  bower2nix = nodeEnv.buildNodePackage {
-    name = "bower2nix";
-    packageName = "bower2nix";
-    version = "3.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz";
-      sha512 = "oNHyIWiU5OpUoDCSSRCZQ6JkXyBgtyi+odbv+XSmO6/KCn3B4SRT3/d+QKNj5UQ8KRsrBAI0Ry7CG2OtqrFE1A==";
-    };
-    dependencies = [
-      sources."argparse-1.0.4"
-      sources."array-find-index-1.0.2"
-      sources."balanced-match-1.0.2"
-      sources."bower-1.8.14"
-      sources."bower-endpoint-parser-0.2.1"
-      sources."bower-json-0.6.0"
-      sources."bower-logger-0.2.1"
-      sources."brace-expansion-1.1.11"
-      sources."camelcase-2.1.1"
-      sources."camelcase-keys-2.1.0"
-      sources."concat-map-0.0.1"
-      sources."currently-unhandled-0.4.1"
-      sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
-      sources."ends-with-0.2.0"
-      sources."error-ex-1.3.2"
-      sources."ext-list-2.2.2"
-      sources."ext-name-3.0.0"
-      sources."find-up-1.1.2"
-      (sources."fs-extra-0.26.7" // {
-        dependencies = [
-          sources."graceful-fs-4.2.11"
-        ];
-      })
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-stdin-4.0.1"
-      sources."glob-6.0.4"
-      sources."graceful-fs-3.0.12"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."indent-string-2.1.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."intersect-1.0.1"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.15.1"
-      sources."is-finite-1.1.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-utf8-0.2.1"
-      (sources."jsonfile-2.4.0" // {
-        dependencies = [
-          sources."graceful-fs-4.2.11"
-        ];
-      })
-      (sources."klaw-1.3.1" // {
-        dependencies = [
-          sources."graceful-fs-4.2.11"
-        ];
-      })
-      (sources."load-json-file-1.1.0" // {
-        dependencies = [
-          sources."graceful-fs-4.2.11"
-        ];
-      })
-      sources."lodash-4.2.1"
-      sources."loud-rejection-1.6.0"
-      sources."map-obj-1.0.1"
-      sources."meow-3.7.0"
-      sources."mime-db-1.53.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."ms-2.0.0"
-      sources."natives-1.1.6"
-      sources."normalize-package-data-2.5.0"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."os-tmpdir-1.0.2"
-      sources."parse-json-2.2.0"
-      sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      (sources."path-type-1.1.0" // {
-        dependencies = [
-          sources."graceful-fs-4.2.11"
-        ];
-      })
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."promised-temp-0.1.0"
-      sources."q-1.5.1"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."redent-1.0.0"
-      sources."repeating-2.0.1"
-      sources."resolve-1.22.8"
-      (sources."rimraf-2.7.1" // {
-        dependencies = [
-          sources."glob-7.2.3"
-        ];
-      })
-      sources."semver-5.7.2"
-      sources."signal-exit-3.0.7"
-      sources."sort-keys-1.1.2"
-      sources."sort-keys-length-1.0.1"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.20"
-      sources."sprintf-js-1.0.3"
-      sources."strip-bom-2.0.0"
-      sources."strip-indent-1.0.1"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      (sources."temp-0.8.3" // {
-        dependencies = [
-          sources."rimraf-2.2.8"
-        ];
-      })
-      sources."trim-newlines-1.0.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Generate nix expressions to fetch bower dependencies";
-      homepage = "https://github.com/rvl/bower2nix";
-      license = "GPL-3.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";

pkgs/development/node-packages/overrides.nix

@@ -36,15 +36,6 @@ final: prev: {
     buildInputs = [ final.node-gyp-build ];
   };
 
-  bower2nix = prev.bower2nix.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    postInstall = ''
-      for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]}
-      done
-    '';
-  };
-
   expo-cli = prev."expo-cli".override (oldAttrs: {
     # The traveling-fastlane-darwin optional dependency aborts build on Linux.
     dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.hostPlatform.isLinux then "darwin" else "linux"}") oldAttrs.dependencies;

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

@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.34.0";
+  version = "0.34.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UjwBxuhXuwJfWewg9si/oIuXgiqbNAYm4lK2f+C6VJU=";
+    hash = "sha256-JSc1Atl6nN0eOJf4dx7tkb05creU43zRM08HKorznW4=";
   };
 
   build-system = [

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

@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -24,16 +23,14 @@
 
 buildPythonPackage rec {
   pname = "blackjax";
-  version = "1.2.3";
+  version = "1.2.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "blackjax-devs";
     repo = "blackjax";
     rev = "refs/tags/${version}";
-    hash = "sha256-f1piE79TLVLtIe9/DaLhXss/ifhU719nEylyl70SVJc=";
+    hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM=";
   };
 
   build-system = [ setuptools-scm ];

pkgs/development/python-modules/gcal-sync/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "gcal-sync";
-  version = "6.1.4";
+  version = "6.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "gcal_sync";
     rev = "refs/tags/${version}";
-    hash = "sha256-aKLuv/hH9ZVM8WeUwCtJ6BB2/aQh6NHJKh890hR23eM=";
+    hash = "sha256-qEvXSyiqTj5rLI+voieNzCUKsOxcJVhI0z3pbbL7VcQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

pkgs/development/python-modules/google-cloud-kms/default.nix

@@ -15,14 +15,15 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "2.23.0";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "google_cloud_kms";
-    hash = "sha256-UrX8b3CxY1FvrWEKr8CI++eI9QHVu+HV9FjNw/y6/Sw=";
+    inherit version;
+    hash = "sha256-suyMBB/cl8hkW/w7S2TNFJ32JFl8dbSuS8qmIU7oSus=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "griffe";
     rev = "refs/tags/${version}";
-    hash = "sha256-aRztItjmCTAJuA/ZkQBJFx/uyH64Us2h5ad1kVsmKlY=";
+    hash = "sha256-IDIacG1FM/JidHV76PGTaPnkIfulAli8+YLuiuPHdZ8=";
   };
 
   build-system = [ pdm-backend ];

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

@@ -4,6 +4,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
   isPyPy,
   substituteAll,
 
@@ -44,7 +45,15 @@ buildPythonPackage rec {
     hash = "sha256-WeoZE2TPBAhzBBcZNQqoiqvribMCLSZWk/XpdMydvCQ=";
   };
 
-  patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+  patches = [
+    # Fix tests failing with new enough ffmpeg
+    # Upstream PR: https://github.com/imageio/imageio/pull/1101
+    # FIXME: remove when merged
+    (fetchpatch {
+      url = "https://github.com/imageio/imageio/commit/8d1bea4b560f3aa10ed2d250e483173f488f50fe.patch";
+      hash = "sha256-68CzSoJzbr21N97gWu5qVYh6QeBS9zon8XmytcVK89c=";
+    })
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     (substituteAll {
       src = ./libgl-path.patch;
       libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";

pkgs/development/python-modules/langchain-community/default.nix

@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-community";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-community==${version}";
-    hash = "sha256-8kF7KlXcWbquRtp8EumkFYhGd0onxifVZsts0SU1dzE=";
+    hash = "sha256-h7+89w8PkSpFxGGQKFC6FuB6Q2B27EYgLk0aiPqwp4s=";
   };
 
   sourceRoot = "${src.name}/libs/community";

pkgs/development/python-modules/langchain-core/default.nix

@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.0";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-core==${version}";
-    hash = "sha256-BCqrJuy7R2jT3QmTvYwn8gHX7bc6Tq8HArK+F3PjBhw=";
+    hash = "sha256-s2tqBJpWJNy0SnHWt0RQowmRbBD+7zqFEeDuFrUzr2U=";
   };
 
   sourceRoot = "${src.name}/libs/core";

pkgs/development/python-modules/langchain-openai/default.nix

@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-openai==${version}";
-    hash = "sha256-3wTSvvPOMZciEqPxpcjrcqEpK//qwsEmvZnlZBfjltQ=";
+    hash = "sha256-M1gyw0Nmh+aLU9scbuqmK2kPyfwtaFaCfue+T8PLguQ=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";

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

@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain==${version}";
-    hash = "sha256-2dHsZWn1MN/gLnUdYp84gbtWkvB0j0iieij4W9tzPzY=";
+    hash = "sha256-Zg+9ZwzTDKCyfz4T/tVIGfRUUmkE939hocxSWpFRngQ=";
   };
 
   sourceRoot = "${src.name}/libs/langchain";

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.10";
+  version = "0.3.11";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ndT5bAiUpjkgD2oeS0s/u69a4bBHI4zoXbudcWogTAU=";
+    hash = "sha256-zOTuvc25J2Q9swSntFzjmVCkN13CnYFgnsPc5/rkvVI=";
   };
 
   build-system = [ setuptools ];

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20240927";
+  version = "1.0.2.20241001";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nelIcgIsZNa7sqIT7AyA3eZqBpkSZisn/3osvqaBhNk=";
+    hash = "sha256-Q1CgVkbeaphsuzsHYnkOKpW5E2oSfAuSN8rotfsZzeE=";
   };
 
   build-system = [ setuptools ];

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "py-serializable";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "madpah";
     repo = "serializable";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8ciRzanrcb7DMAcWzIxRkgeCRGw+Ji8Epnw67cylGeQ=";
+    hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo=";
   };
 
   build-system = [ poetry-core ];

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

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.2.7";
+  version = "3.2.8";
 
   disabled = pythonOlder "3.7";
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "pyupio";
     repo = "safety";
     rev = "refs/tags/${version}";
-    hash = "sha256-JWbiw9qgfDo0UMAcqIhk1Y5tW0aSaZtbVdpdaY2z+3w=";
+    hash = "sha256-H8YF9rax6dM6KCLGiRk7bIHhYVw0RNkH/B9VTZRHe9c=";
   };
 
   postPatch = ''

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1243";
+  version = "3.0.1244";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-Lsd+edE6Oqi+implGkNlzmIDW1TseN0/zsba1gFuAjU=";
+    hash = "sha256-T6vYefIN57iD/wBy4ZpVXAJyZNHr/faO08VNSDYRs+8=";
   };
 
   build-system = [ setuptools ];

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xknxproject";
-  version = "3.7.1";
+  version = "3.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = "xknxproject";
     rev = "refs/tags/${version}";
-    hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8=";
+    hash = "sha256-TiFeyXgu7JKrCEzGCnamguWEP+HN4DRzYOErmdlWZFY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/tools/analysis/checkov/default.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.254";
+  version = "3.2.256";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-+3hx6MEJWDbTby0bvUSe/AGoneqJ/ojzkkpb8oF4ZIo=";
+    hash = "sha256-y6BhNpbXwna8UVDBaAmxEyjIsCDslpi5sF/gAyX65Xg=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];

pkgs/development/tools/goa/default.nix

@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.19.0";
+  version = "3.19.1";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-NacLcVYQZTHqhTyX5It+BHD9v/ikUEMZCbfjhNYU98M=";
+    hash = "sha256-UOw0bAUvaKpMmFmAAlheALhtgXU2+Df6b/nSRH7bWHc=";
   };
-  vendorHash = "sha256-9h8+OthG161dHA//6R8oRwNhtpx0HpofJeZ1okEfbaE=";
+  vendorHash = "sha256-IqzW5fOLLBbpPFTE5PiOISdmp3Gq6b8SUbG4CbbU01s=";
 
   subPackages = [ "cmd/goa" ];
 

pkgs/development/tools/gqlgenc/default.nix

@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "gqlgenc";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "yamashou";
     repo = "gqlgenc";
     rev = "v${version}";
-    sha256 = "sha256-i2+J8hWbADeOmua4I3/NX8MC6FKP+5I9BqwCDkLOnvw=";
+    sha256 = "sha256-g+l493Nt0SuW4gwJh0s9Zeejpyx2oLxVDykIvBup638=";
   };
 
   excludedPackages = [ "example" ];
 
-  vendorHash = "sha256-/lrOc2suNyNRlpi22QUr6MZCIrdWaWiZUv6pe/mYnB8=";
+  vendorHash = "sha256-YGFMQrxghJIgmiwEPfEqaACH7OETVkD8O7oUhm9foJo=";
 
   meta = with lib; {
     description = "Go tool for building GraphQL client with gqlgen";

pkgs/servers/klipper/default.nix

@@ -4,6 +4,7 @@
 , python3
 , unstableGitUpdater
 , makeWrapper
+, writeShellScript
 }:
 
 stdenv.mkDerivation rec {
@@ -44,6 +45,18 @@ stdenv.mkDerivation rec {
       --replace 'GCC_CMD = "gcc"' 'GCC_CMD = "${stdenv.cc.targetPrefix}cc"'
   '';
 
+  pythonInterpreter =
+    (python3.withPackages (
+      p: with p; [
+        numpy
+        matplotlib
+      ]
+    )).interpreter;
+
+  pythonScriptWrapper = writeShellScript pname ''
+    ${pythonInterpreter} "@out@/lib/scripts/@script@" "$@"
+  '';
+
   # NB: We don't move the main entry point into `/bin`, or even symlink it,
   # because it uses relative paths to find necessary modules. We could wrap but
   # this is used 99% of the time as a service, so it's not worth the effort.
@@ -56,6 +69,8 @@ stdenv.mkDerivation rec {
     # under `klipper_path`
     cp -r $src/docs $out/lib/docs
     cp -r $src/config $out/lib/config
+    cp -r $src/scripts $out/lib/scripts
+    cp -r $src/klippy $out/lib/klippy
 
     # Add version information. For the normal procedure see https://www.klipper3d.org/Packaging.html#versioning
     # This is done like this because scripts/make_version.py is not available when sourceRoot is set to "${src.name}/klippy"
@@ -64,6 +79,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     chmod 755 $out/lib/klipper/klippy.py
     makeWrapper $out/lib/klipper/klippy.py $out/bin/klippy --chdir $out/lib/klipper
+
+    substitute "$pythonScriptWrapper" "$out/bin/klipper-calibrate-shaper" \
+      --subst-var "out" \
+      --subst-var-by "script" "calibrate_shaper.py"
+    chmod 755 "$out/bin/klipper-calibrate-shaper"
+
     runHook postInstall
   '';
 

pkgs/servers/matrix-hebbot/default.nix

@@ -1,44 +0,0 @@
-{ lib
-, fetchFromGitHub
-, stdenv
-, rustPlatform
-, pkg-config
-, cmake
-, openssl
-, autoconf
-, automake
-, Security
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "hebbot";
-  version = "2.1";
-
-  src = fetchFromGitHub {
-    owner = "haecker-felix";
-    repo = "hebbot";
-    rev = "v${version}";
-    sha256 = "sha256-zcsoTWpNonkgJLTC8S9Nubnzdhj5ROL/UGNWUsLxLgs=";
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "matrix-qrcode-0.1.0" = "sha256-g78Ql+r5NYNcnkoirH9E6AHagZgBCgxBfweaX1D0z0E=";
-    };
-  };
-
-  nativeBuildInputs = [ pkg-config cmake ] ++
-    lib.optionals stdenv.hostPlatform.isDarwin [ autoconf automake ];
-
-  buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
-
-  meta = with lib; {
-    description = "Matrix bot which can generate \"This Week in X\" like blog posts ";
-    homepage = "https://github.com/haecker-felix/hebbot";
-    changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}";
-    license = with licenses; [ agpl3Only ];
-    mainProgram = "hebbot";
-    maintainers = with maintainers; [ a-kenji ];
-  };
-}

pkgs/servers/minio/default.nix

@@ -21,16 +21,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2024-09-13T20-26-02Z";
+  version = "2024-09-22T00-33-43Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-ldPPnN63OZdnsQjeiKT32VVFkaRyvJ10M5EsVCBoz8I=";
+    hash = "sha256-/2H79fJYdusFNBXj/2i4p+O16wseHzPzJ5LnS1O+Gm4=";
   };
 
-  vendorHash = "sha256-nK3t3wwV6vhU7SHYfhV/LDs5S9N5yTXjB2cbB0rwk+I=";
+  vendorHash = "sha256-MDClQjCh/ygdbybE4jIoWGBsqr3roNn7stXUw9eoN2Y=";
 
   doCheck = false;
 

pkgs/servers/nfd/default.nix

@@ -1,59 +0,0 @@
-{ lib
-, stdenv
-, boost179 # probably needs to match the one from ndn-cxx
-, fetchFromGitHub
-, libpcap
-, ndn-cxx
-, openssl
-, pkg-config
-, sphinx
-, systemd
-, wafHook
-, websocketpp
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
-, withWebSocket ? true
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nfd";
-  version = "24.07";
-
-  src = fetchFromGitHub {
-    owner = "named-data";
-    repo = lib.toUpper pname;
-    rev = "NFD-${version}";
-    hash = "sha256-iEI8iS0eLLVe6PkOiCHL3onYNVYVZ1ttmk/aWrBkDhg=";
-    fetchSubmodules = true;
-  };
-
-  postPatch = ''
-    # These tests fail because they try to check for user/group permissions.
-    rm tests/daemon/mgmt/general-config-section.t.cpp
-  '';
-
-  nativeBuildInputs = [ pkg-config sphinx wafHook ];
-  buildInputs = [ boost179 libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd;
-
-  wafConfigureFlags = [
-    "--boost-includes=${boost179.dev}/include"
-    "--boost-libs=${boost179.out}/lib"
-    "--with-tests"
-  ] ++ lib.optional (!withWebSocket) "--without-websocket";
-
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-    build/unit-tests-core
-    build/unit-tests-daemon
-    build/unit-tests-tools
-    runHook postCheck
-  '';
-
-  meta = with lib; {
-    homepage = "https://named-data.net/";
-    description = "Named Data Networking (NDN) Forwarding Daemon";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ bertof ];
-  };
-}

pkgs/servers/pingvin-share/backend.nix

@@ -31,7 +31,7 @@ buildNpmPackage {
     prisma
   ];
 
-  npmDepsHash = "sha256-Uw2mjg8H+7XTm6SjfYHYkP7MJl8kdJXDKBFcx6VffPs=";
+  npmDepsHash = "sha256-F+pYEsaU4Rsiq1z3rwGeKznZqpITF+AoFgswhTFeXf8=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 

pkgs/servers/pingvin-share/default.nix

@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.1.1";
+  version = "1.1.3";
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
     rev = "v${version}";
-    hash = "sha256-nBNz4xEMEnOJGxVIbpukGzlAEgG+uGntvTJoc+GHmIw=";
+    hash = "sha256-n3EwmS8uKrhEuNOh55eAkEtibAerAy6AduszW4leJuI=";
   };
 in
 

pkgs/servers/pingvin-share/frontend.nix

@@ -23,7 +23,7 @@ buildNpmPackage {
   buildInputs = [ vips ];
   nativeBuildInputs = [ pkg-config ];
 
-  npmDepsHash = "sha256-iw7IoEjiLUiDuK9AKI7jXDaUVT6FklmZuZ+CKDig3tE=";
+  npmDepsHash = "sha256-laVAVwx/A/6TunCmmZYQKAuYqv1xTG3e1DIonj2S9IU=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 

pkgs/tools/admin/balena-cli/default.nix

@@ -19,16 +19,16 @@ let
   };
 in buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "19.0.12";
+  version = "19.0.13";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-/C83s66vTq60FLfKPb27RBGfBC295qs5WWej9Yz4Cak=";
+    hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU=";
   };
 
-  npmDepsHash = "sha256-CdbJqMbBYzy9TfhlXVMJgGr3pLVMX4naRs/rGz96bYo=";
+  npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

pkgs/tools/misc/mbuffer/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mbuffer";
-  version = "20240707";
+  version = "20240929";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "sha256-fzkm6S+qgblqMkIPgCiLVfGFBIDyoDLBbtYbUyZ8rgk=";
+    sha256 = "sha256-77bG3j4kWdI5h3TN1E7Apua4jEEy7eQ9PV4vbBjZpqc=";
   };
 
   buildInputs = [

pkgs/tools/networking/ockam/default.nix

@@ -13,7 +13,7 @@
 
 let
   pname = "ockam";
-  version = "0.132.0";
+  version = "0.134.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
     owner = "build-trust";
     repo = pname;
     rev = "ockam_v${version}";
-    hash = "sha256-ynlXQoOTvfSWCL1BqvIjJYYUDGmjDa0HaN3L8I6p/7Q=";
+    hash = "sha256-6HZI0Gsxn3GmklHl9zJ6yY73FlqcLiyMAqJg8BBmzqg=";
   };
 
-  cargoHash = "sha256-yOSCkOIprQoAGxPi1jsHPmQ9bVaudSNw13jL4jTNehY=";
+  cargoHash = "sha256-VZt7tDewvz7eGpAKzD8pYOnH/3BtH6cULp6uX7CPxX8=";
   nativeBuildInputs = [ git pkg-config ];
   buildInputs = [ openssl dbus ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ];

pkgs/tools/security/cnspec/default.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.23.1";
+  version = "11.24.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZOfAkoRjxM3CFNIPye7thW6wxfGbS2EeeVHW6tnv2v4=";
+    hash = "sha256-CI47eP1e1oXm2WQY89tU3g7DdSwG7UQT46DqOCY7uq0=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-xYhzM3j3zwkX4YLS5V1bScl+dP9N9/XZUHR77CI2sSY=";
+  vendorHash = "sha256-x1rYRUiYqgi22r7CkOlgHHVImVvQ4sLggLV+hfkeW30=";
 
   subPackages = [ "apps/cnspec" ];
 

pkgs/tools/security/gotrue/supabase.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.160.0";
+  version = "2.161.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-29mTu3Cv3rFsm9q79g2BBzRLWfA9WlBip8xbBROCCzo=";
+    hash = "sha256-+tWCA1FGmvqivYI/wqaVY0zJKwqUqpZfotuHhHmuDwc=";
   };
 
-  vendorHash = "sha256-cxLN9bdtpZmnhhP9tIYHQXW+KVmKvbS5+j+0gN6Ml3s=";
+  vendorHash = "sha256-nmvZKkSfOflsrcos3cCZHrq4DVF23TQG9kST0AcjN7E=";
 
   ldflags = [
     "-s"

pkgs/tools/security/kubernetes-polaris/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubernetes-polaris";
-  version = "9.4.0";
+  version = "9.4.1";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
     rev = version;
-    sha256 = "sha256-Vw+4/GVuTM4KioZnFk2RH6rmXD6zQO29NepAr2TwHjI=";
+    sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4=";
   };
 
   vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU=";

pkgs/tools/system/openseachest/default.nix

@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openseachest";
-  version = "24.08";
+  version = "24.08.1";
 
   src = fetchFromGitHub {
     owner = "Seagate";
     repo = "openSeaChest";
     rev = "v${version}";
-    hash = "sha256-g5zCPlqK2AmGvPFqxEeSsZfDf4ksMYdIvJ+1PuuauL8=";
+    hash = "sha256-1vfWX6uTQcM6K6wu9Ygu2xZV4nXm6VnwNHmQ2ceh62s=";
     fetchSubmodules = true;
   };
 

pkgs/top-level/aliases.nix

@@ -1325,6 +1325,7 @@ mapAliases {
 
   ### Q ###
 
+  qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
   qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25
   qflipper = qFlipper; # Added 2022-02-11

pkgs/top-level/all-packages.nix

@@ -902,9 +902,7 @@ with pkgs;
 
   fet-sh = callPackage ../tools/misc/fet-sh { };
 
-  fetchbower = callPackage ../build-support/fetchbower {
+  fetchbower = callPackage ../build-support/fetchbower { };
-    inherit (nodePackages) bower2nix;
-  };
 
   fetchbzr = callPackage ../build-support/fetchbzr { };
 
@@ -5205,10 +5203,6 @@ with pkgs;
 
   hebcal = callPackage ../tools/misc/hebcal { };
 
-  hebbot = callPackage ../servers/matrix-hebbot {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   hexio = callPackage ../development/tools/hexio { };
 
   hexyl = callPackage ../tools/misc/hexyl { };
@@ -7793,10 +7787,6 @@ with pkgs;
 
   uniscribe = callPackage ../tools/text/uniscribe { };
 
-  galculator = callPackage ../applications/misc/galculator {
-    gtk = gtk3;
-  };
-
   fornalder = callPackage ../applications/version-management/fornalder { };
 
   galen = callPackage ../development/tools/galen { };
@@ -13223,8 +13213,6 @@ with pkgs;
 
   typesense = callPackage ../servers/search/typesense { };
 
-  typos = callPackage ../development/tools/typos { };
-
   tz = callPackage ../tools/misc/tz { };
 
   u9fs = callPackage ../servers/u9fs { };
@@ -16763,8 +16751,6 @@ with pkgs;
 
   gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { };
 
-  gimoji = callPackage ../applications/misc/gimoji { };
-
   guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
 
   # Needed for autogen
@@ -19189,12 +19175,6 @@ with pkgs;
     cudaPackages = cudaPackages_11;
   };
 
-  ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
-
-  ndn-tools = callPackage ../tools/networking/ndn-tools { };
-
-  nfd = callPackage ../servers/nfd { };
-
   cddlib = callPackage ../development/libraries/cddlib { };
 
   cdk-go = callPackage ../tools/security/cdk-go { };
@@ -22468,6 +22448,13 @@ with pkgs;
       url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
       hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18=";
     };
+    patches = [
+      # Backport GCC 14 build fix
+      (fetchpatch {
+        url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch";
+        hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
+      })
+    ];
   };
 
   opencl-headers = callPackage ../development/libraries/opencl-headers { };
@@ -32246,9 +32233,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
   qbittorrent-nox = qbittorrent.override { guiSupport = false; };
-  qbittorrent-qt5 = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
 
   qcad = libsForQt5.callPackage ../applications/misc/qcad { };
 

pkgs/top-level/python-packages.nix

@@ -17583,6 +17583,10 @@ self: super: with self; {
     inherit (pkgs) graphviz;
   };
 
+  xen = toPythonModule (pkgs.xen-slim.override {
+    python3Packages = self;
+  });
+
   xformers = callPackage ../development/python-modules/xformers { };
 
   xgboost = callPackage ../development/python-modules/xgboost {