Merge master into staging-next

2024-11-12 03:56:17 +03:00 · 2023-09-14 00:02:14 +00:00 · 2023-09-14 00:02:14 +00:00 · 186767dea4
commit 186767dea4
parent 98892da85b fce23b34d2
63 changed files with 14916 additions and 14003 deletions
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@ -30,7 +30,7 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca
 {-# OPTIONS_GHC -Wall #-}
 {-# LANGUAGE DataKinds #-}

-import Control.Monad (forM_, (<=<))
+import Control.Monad (forM_, forM, (<=<))
 import Control.Monad.Trans (MonadIO (liftIO))
 import Data.Aeson (
   FromJSON,
@ -108,6 +108,7 @@ newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs}
 data Eval = Eval
   { id :: Int
   , jobsetevalinputs :: JobsetEvalInputs
+   , builds :: Seq Int
   }
   deriving (Generic, ToJSON, FromJSON, Show)

@ -151,15 +152,20 @@ data Build = Build
   }
   deriving (Generic, ToJSON, FromJSON, Show)

+data HydraSlownessWorkaroundFlag = HydraSlownessWorkaround | NoHydraSlownessWorkaround
+data RequestLogsFlag = RequestLogs | NoRequestLogs
+
 main :: IO ()
 main = do
   args <- getArgs
   case args of
-      ["get-report"] -> getBuildReports
+      ["get-report", "--slow"] -> getBuildReports HydraSlownessWorkaround
+      ["get-report"] -> getBuildReports NoHydraSlownessWorkaround
      ["ping-maintainers"] -> printMaintainerPing
-      ["mark-broken-list"] -> printMarkBrokenList
+      ["mark-broken-list", "--no-request-logs"] -> printMarkBrokenList NoRequestLogs
+      ["mark-broken-list"] -> printMarkBrokenList RequestLogs
      ["eval-info"] -> printEvalInfo
-      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info"
+      _ -> putStrLn "Usage: get-report [--slow] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info"

 reportFileName :: IO FilePath
 reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
@ -167,18 +173,27 @@ reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
 showT :: Show a => a -> Text
 showT = Text.pack . show

-getBuildReports :: IO ()
-getBuildReports = runReq defaultHttpConfig do
+getBuildReports :: HydraSlownessWorkaroundFlag -> IO ()
+getBuildReports opt = runReq defaultHttpConfig do
   evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"]
-   eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay
+   eval@Eval{id} <- maybe (liftIO $ fail "No Evaluation found") pure evalMay
   liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..."
-   buildReports :: Seq Build <- hydraJSONQuery (responseTimeout 600000000) ["eval", showT id, "builds"]
+   buildReports <- getEvalBuilds opt id
   liftIO do
      fileName <- reportFileName
      putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName
      now <- getCurrentTime
      encodeFile fileName (eval, now, buildReports)

+getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build)
+getEvalBuilds NoHydraSlownessWorkaround id =
+  hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"]
+getEvalBuilds HydraSlownessWorkaround id = do
+  Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ]
+  forM builds $ \buildId -> do
+    liftIO $ putStrLn $ "Querying build " <> show buildId
+    hydraJSONQuery mempty [ "build", showT buildId ]
+
 hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a)
 hydraQuery responseType option query =
   responseBody
@ -187,7 +202,7 @@ hydraQuery responseType option query =
         (foldl' (/:) (https "hydra.nixos.org") query)
         NoReqBody
         responseType
-         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option)
+         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option)

 hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a
 hydraJSONQuery = hydraQuery jsonResponse
@ -775,16 +790,20 @@ printMaintainerPing = do
       textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps
   Text.putStrLn textBuildSummary

-printMarkBrokenList :: IO ()
-printMarkBrokenList = do
+printMarkBrokenList :: RequestLogsFlag -> IO ()
+printMarkBrokenList reqLogs = do
   (_, fetchTime, buildReport) <- readBuildReports
   runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} ->
      case (getBuildState build, Text.splitOn "." $ unJobName job) of
         (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do
-            -- Fetch build log from hydra to figure out the cause of the error.
-            build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"]
            -- We use the last probable error cause found in the build log file.
-            let error_message = fromMaybe " failure " $ safeLast $ mapMaybe probableErrorCause build_log
+            error_message <- fromMaybe "failure" <$>
+              case reqLogs of
+                NoRequestLogs -> pure Nothing
+                RequestLogs -> do
+                  -- Fetch build log from hydra to figure out the cause of the error.
+                  build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"]
+                  pure $ safeLast $ mapMaybe probableErrorCause build_log
            liftIO $ putStrLn $ "  - " <> Text.unpack name <> " # " <> error_message <> " in job https://hydra.nixos.org/build/" <> show id <> " at " <> formatTime defaultTimeLocale "%Y-%m-%d" fetchTime
         _ -> pure ()

--- a/maintainers/scripts/haskell/mark-broken.sh
+++ b/maintainers/scripts/haskell/mark-broken.sh
@ -10,6 +10,24 @@

 set -euo pipefail

+do_commit=false
+mark_broken_list_flags=""
+
+for arg in "$@"; do
+    case "$arg" in
+        --do-commit)
+            do_commit=true
+            ;;
+        --no-request-logs)
+            mark_broken_list_flags="$mark_broken_list_flags $arg"
+            ;;
+        *)
+            echo "$0: unknown flag: $arg"
+            exit 100
+            ;;
+    esac
+done
+
 broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"

 tmpfile=$(mktemp)
@ -17,7 +35,7 @@ trap "rm ${tmpfile}" 0

 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."
 echo "Generating a list of broken builds and displaying for manual confirmation ..."
-maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile"
+maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | sort -i > "$tmpfile"

 $EDITOR "$tmpfile"

@ -34,7 +52,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG"
 $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh
 evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info)

-if [[ "${1:-}" == "--do-commit" ]]; then
+if $do_commit; then
 git add $broken_config
 git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
 git add pkgs/development/haskell-modules/hackage-packages.nix
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@ -662,6 +662,11 @@ in
        ];
      };

+      # ZFS already has its own scheduler. Without this my(@Artturin) computer froze for a second when I nix build something.
+      services.udev.extraRules = ''
+        ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="zfs_member", ATTR{../queue/scheduler}="none"
+      '';
+
      environment.etc = genAttrs
        (map
          (file: "zfs/zed.d/${file}")
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@ -4,18 +4,20 @@
 , autoreconfHook
 , alsa-lib
 , python3
-, SDL
+, SDL2
+, libXext
+, Cocoa
 }:

 stdenv.mkDerivation rec {
  pname = "schismtracker";
-  version = "20220506";
+  version = "20230906";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "sha256-fK0FBn9e7l1Y/A7taFlaoas6ZPREFhEmskVBqjda6q0=";
+    sha256 = "sha256-eW1sqfcAR3lutSyQKj7j1elkFTa8jfZqgrJYYAzMlzo=";
  };

  configureFlags = [ "--enable-dependency-tracking" ]
@ -23,10 +25,18 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ autoreconfHook python3 ];

-  buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib;
+  buildInputs = [ SDL2 ]
+    ++ lib.optionals stdenv.isLinux [ alsa-lib libXext ]
+    ++ lib.optionals stdenv.isDarwin [ Cocoa ];

  enableParallelBuilding = true;

+  # Our Darwin SDL2 doesn't have a SDL2main to link against
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure.ac \
+      --replace '-lSDL2main' '-lSDL2'
+  '';
+
  meta = with lib; {
    description = "Music tracker application, free reimplementation of Impulse Tracker";
    homepage = "http://schismtracker.org/";
--- a/pkgs/applications/emulators/yuzu/sources.nix
+++ b/pkgs/applications/emulators/yuzu/sources.nix
@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2023-08-27
+# Last updated: 2023-09-13
 {
  compatList = {
-    rev = "f440391993fe499c79d647ed0a20d117c0db0c27";
+    rev = "463d5f3537eed71638d4f5809467afec1eb5988c";
    hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
  };

  mainline = {
-    version = "1538";
-    hash = "sha256:1wynpcx6gwdbahf7nm22jslk9hbcy17nxbr6qnzagndrws30csx5";
+    version = "1557";
+    hash = "sha256:19wlia1g2ll9fwbn4yj57cax4lvs3d6w41z2yy2pjdq84yzgg1gs";
  };

  ea = {
-    version = "3838";
-    distHash = "sha256:0riwahdlhi4a96ya4pi7g0anwa35z8zhbax87m2mk89vwrjnf2am";
-    fullHash = "sha256:1a1cq4dg624y3ixgc05ihlhy1fnpp98xnc60cssrdmmzyp79hrjp";
+    version = "3864";
+    distHash = "sha256:02dxf9f33agnp91myxxklrdjalh6d32zjlg07p7v5v48mymnxhv9";
+    fullHash = "sha256:020ljbgb79i66y6fqj4xblzv4s808l50jy7wwl0d6jwpck1q3i11";
  };
 }
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@ -61,8 +61,8 @@ rec {
  };

  kops_1_27 = mkKops rec {
-    version = "1.27.0";
-    sha256 = "sha256-XJOdqOT/vMVXZmVasXRb+pdmWcSd6lsyQDCnZKyqrto=";
+    version = "1.27.1";
+    sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
    rev = "v${version}";
  };
 }
--- a/pkgs/applications/science/logic/egglog/default.nix
+++ b/pkgs/applications/science/logic/egglog/default.nix
@ -5,13 +5,13 @@

 rustPlatform.buildRustPackage {
  pname = "egglog";
-  version = "unstable-2023-08-29";
+  version = "unstable-2023-09-12";

  src = fetchFromGitHub {
    owner = "egraphs-good";
    repo = "egglog";
-    rev = "c83fc750878755eb610a314da90f9273b3bfe25d";
-    hash = "sha256-bo3LU7WQ7WWnyL4EVOpzxxSFioXTozCSQFIFXyoxKLg=";
+    rev = "4d67f262a6f27aa5cfb62a2cfc7df968959105df";
+    hash = "sha256-1mc7dW2pgaK4D7ZmlSHohb+6lcr7M9SRLUV/Dod8Rv0=";
  };

  cargoLock = {
--- a/pkgs/applications/window-managers/miriway/default.nix
+++ b/pkgs/applications/window-managers/miriway/default.nix
@ -9,15 +9,15 @@
 , libxkbcommon
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "miriway";
-  version = "unstable-2023-07-27";
+  version = "unstable-2023-08-30";

  src = fetchFromGitHub {
    owner = "Miriway";
    repo = "Miriway";
-    rev = "bfa3bdea552a9b36ba5828e667e847d05a7310fc";
-    hash = "sha256-gMQqiR7zhwUJ/zw61XuBXz1/F7EuQIM1A23ZQ5T38Z8=";
+    rev = "2c9a0599e1a9b37f2a73a245eacce307a3e5b883";
+    hash = "sha256-VCLl4GyUmzcC/OEfxXV0bI/6lxLP9eIAAOIjANEI1d8=";
  };

  strictDeps = true;
@ -68,4 +68,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.linux;
    maintainers = with maintainers; [ OPNA2608 ];
  };
-}
+})
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f.tar.gz",
-  "sha256": "0yhymzcsls48hf44ncd79xn786rfh4k70h78w7b0ihn7lrjgsynv",
-  "msg": "Update from Hackage at 2023-07-24T19:28:29Z"
+  "commit": "69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc.tar.gz",
+  "sha256": "16ij50f7cx8gl3ypzwy50f5dr68y6m6n732sa1hwsng5db4vqzv7",
+  "msg": "Update from Hackage at 2023-08-17T07:12:25Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -116,10 +116,6 @@ self: super: {
  # There will probably be a new revision soon.
  hls-brittany-plugin = assert super.hls-brittany-plugin.version == "1.1.0.0"; doJailbreak super.hls-brittany-plugin;

-  hls-hlint-plugin = super.hls-hlint-plugin.override {
-    apply-refact = self.apply-refact_0_11_0_0;
-  };
-
  # For -f-auto see cabal.project in haskell-language-server.
  ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);

@ -205,6 +201,11 @@ self: super: {
    })
  ] super.aeson);

+  # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6
+  aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: {
+    th-abstraction = hfinal.th-abstraction_0_5_0_0;
+  });
+
  # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
  orbits = dontCheck super.orbits;

@ -237,8 +238,7 @@ self: super: {
  # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
  # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
  # store. Testing is done upstream.
-  # 2023-07-27: Allow base-4.17
-  arion-compose = dontCheck (assert super.arion-compose.version == "0.2.0.0"; doJailbreak super.arion-compose);
+  arion-compose = dontCheck super.arion-compose;

  # 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5
  lvar = doJailbreak super.lvar;
@ -253,6 +253,10 @@ self: super: {
  # https://github.com/glguy/config-value/commit/c5558c8258598fab686c259bff510cc1b19a0c50#commitcomment-119514821
  config-value = doJailbreak super.config-value;

+  # path-io bound is adjusted in 0.6.1 release
+  # https://github.com/tek/hix/commit/019426f6a3db256e4c96558ffe6fa2114e2f19a0
+  hix = doJailbreak super.hix;
+
  # waiting for release: https://github.com/jwiegley/c2hsc/issues/41
  c2hsc = appendPatch (fetchpatch {
    url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch";
@ -312,7 +316,12 @@ self: super: {

  # Overriding the version pandoc dependency uses as the latest release has version bounds
  # defined as >= 3.1  && < 3.2, can be removed once pandoc gets bumped by Stackage.
-  patat = super.patat.override { pandoc = self.pandoc_3_1_6; };
+  patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; };
+
+  # http2 also overridden in all-packages.nix for mailctl.
+  # twain is currently only used by mailctl, so the .overrideScope shouldn't
+  # negatively affect any other packages, at least currently...
+  twain = super.twain.overrideScope (self: _: { http2 = self.http2_3_0_3; });

  # The latest release on hackage has an upper bound on containers which
  # breaks the build, though it works with the version of containers present
@ -338,7 +347,7 @@ self: super: {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1i14mv8z9sr5sckckwiba4cypgs3iwk19pyrl9xzcrzz426dxrba";
+      sha256 = "0fg3q7apdijnlgyb0yps1znjjd2nv3016r9cyxyw209sqn3whnx5";
      # delete android and Android directories which cause issues on
      # darwin (case insensitive directory). Since we don't need them
      # during the build process, we can delete it to prevent a hash
@ -856,9 +865,6 @@ self: super: {
  elm-server = markBroken super.elm-server;
  elm-yesod = markBroken super.elm-yesod;

-  # Tests failure with GHC >= 9.0.1, fixed in 1.6.24.4
-  yesod-core = assert super.yesod-core.version == "1.6.24.3"; dontCheck super.yesod-core;
-
  # https://github.com/Euterpea/Euterpea2/issues/40
  Euterpea = doJailbreak super.Euterpea;

@ -896,6 +902,22 @@ self: super: {
  # It does not support aeson 2.0
  descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; };

+  # Apply compatibility patches until a new release arrives
+  # https://github.com/phadej/spdx/issues/33
+  spdx = appendPatches [
+    (fetchpatch {
+      name = "spdx-ghc-9.4.patch";
+      url = "https://github.com/phadej/spdx/pull/30/commits/545dc69f433225c837375fba4cbbdb7f9cc7b09b.patch";
+      sha256 = "0p2h8dxkjy2v0dx7h6v62clmx5n5j3c4zh4myh926fijympi1glz";
+    })
+    (fetchpatch {
+      name = "spdx-ghc-9.6.patch";
+      url = "https://github.com/phadej/spdx/pull/32/commits/b51f665e9960614274ff6a9ac658802c1a785687.patch";
+      sha256 = "01vf1h0djr84yxsjfhym715ncx0w5q4l02k3dkbmg40pnc62ql4h";
+      excludes = [ ".github/**" ];
+    })
+  ] super.spdx;
+
  # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
  jwt = dontCheck super.jwt;

@ -935,25 +957,6 @@ self: super: {
  # https://github.com/basvandijk/concurrent-extra/issues/12
  concurrent-extra = dontCheck super.concurrent-extra;

-  bloomfilter = appendPatches [
-    # https://github.com/bos/bloomfilter/issues/7
-    ./patches/bloomfilter-fix-on-32bit.patch
-    # Fix build with GHC >= 9.2 by using stock unsafeShift* functions
-    # https://github.com/bos/bloomfilter/pull/20
-    (pkgs.fetchpatch {
-      name = "bloomfilter-ghc-9.2-shift.patch";
-      url = "https://github.com/bos/bloomfilter/pull/20/commits/fb79b39c44404fd791a3bed973e9d844fb084f1e.patch";
-      sha256 = "0clmr5iar4mhp8nbgh1c1rh4fl7dy0g2kbqqh0af8aqmhjpqzrq3";
-    })
-  ] (overrideCabal (drv: {
-    # Make sure GHC 9.2 patch applies correctly
-    revision = null;
-    editedCabalFile = null;
-    prePatch = drv.prePatch or "" + ''
-      "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
-    '';
-  }) super.bloomfilter);
-
  # https://github.com/pxqr/base32-bytestring/issues/4
  base32-bytestring = dontCheck super.base32-bytestring;

@ -1161,9 +1164,11 @@ self: super: {
  github-backup = doJailbreak super.github-backup;

  # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113
-  # doJailbreak: waiting on revision 1 to hit hackage
-  servant-auth-client = doJailbreak (dontCheck super.servant-auth-client);
+  servant-auth-client = dontCheck super.servant-auth-client;
+  # Allow lens-aeson >= 1.2 https://github.com/haskell-servant/servant/issues/1703
  servant-auth-server = doJailbreak super.servant-auth-server;
+  # Allow hspec >= 2.10 https://github.com/haskell-servant/servant/issues/1704
+  servant-foreign = doJailbreak super.servant-foreign;

  # Generate cli completions for dhall.
  dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
@ -1918,27 +1923,23 @@ self: super: {
  inherit (let
    pandoc-cli-overlay = self: super: {
      # pandoc-cli requires pandoc >= 3.1
-      pandoc = self.pandoc_3_1_6;
+      pandoc = self.pandoc_3_1_6_1;

      # pandoc depends on crypton-connection, which requires tls >= 1.7
-      tls = self.tls_1_7_0;
+      tls = self.tls_1_7_1;
      crypton-connection = unmarkBroken super.crypton-connection;

      # pandoc depends on http-client-tls, which only starts depending
      # on crypton-connection in http-client-tls-0.3.6.2.
-      http-client-tls = self.http-client-tls_0_3_6_2;
-
-      # pandoc and skylighting are developed in tandem
-      skylighting-core = self.skylighting-core_0_13_4_1;
-      skylighting = self.skylighting_0_13_4_1;
+      http-client-tls = self.http-client-tls_0_3_6_3;
    };
  in {
    pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay;
-    pandoc_3_1_6 = doDistribute (super.pandoc_3_1_6.overrideScope pandoc-cli-overlay);
+    pandoc_3_1_6_1 = doDistribute (super.pandoc_3_1_6_1.overrideScope pandoc-cli-overlay);
    pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
  })
    pandoc-cli
-    pandoc_3_1_6
+    pandoc_3_1_6_1
    pandoc-lua-engine
    ;

@ -2539,13 +2540,6 @@ self: super: {
  })
  super.polynomial);

-  # Unreleased bound relaxing patch allowing scotty 0.12
-  taffybar = appendPatch (pkgs.fetchpatch {
-    name = "taffybar-allow-scotty-0.12.patch";
-    url = "https://github.com/taffybar/taffybar/commit/2e428ba550fc51067526a0350b91185acef72d19.patch";
-    sha256 = "1lpcz671mk5cwqffjfi9ncc0d67bmwgzypy3i37a2fhfmxd0y3nl";
-  }) ((p: assert p.version == "4.0.0"; p) super.taffybar);
-
  # Tests likely broke because of https://github.com/nick8325/quickcheck/issues/359,
  # but fft is not on GitHub, so no issue reported.
  fft = dontCheck super.fft;
@ -2562,12 +2556,6 @@ self: super: {
  # has been resolved.
  lucid-htmx = doJailbreak super.lucid-htmx;

-  # Needs lsp >= 2.1
-  futhark = super.futhark.overrideScope (fself: _: {
-    lsp = fself.lsp_2_1_0_0;
-    lsp-types = fself.lsp-types_2_0_1_0;
-  });
-
  # Too strict bounds on hspec
  # https://github.com/klapaucius/vector-hashtables/issues/11
  vector-hashtables = doJailbreak super.vector-hashtables;
@ -2777,12 +2765,7 @@ self: super: {

  # Tests fail due to the newly-build fourmolu not being in PATH
  # https://github.com/fourmolu/fourmolu/issues/231
-  fourmolu_0_13_1_0 = dontCheck (super.fourmolu_0_13_1_0.overrideScope (lself: lsuper: {
-    Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
-    ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523;
-    parsec = lself.parsec_3_1_16_1;
-    text = lself.text_2_0_2;
-  }));
+  fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0;

  # Merged upstream, but never released. Allows both intel and aarch64 darwin to build.
  # https://github.com/vincenthz/hs-gauge/pull/106
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@ -103,7 +103,6 @@ self: super: {
    # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported.
    # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
    additionalDeps = with self.haskell-language-server.scope; [
-      hls-brittany-plugin
      hls-haddock-comments-plugin
      (unmarkBroken hls-splice-plugin)
      hls-tactics-plugin
@ -112,17 +111,21 @@ self: super: {
    Cabal = lself.Cabal_3_6_3_0;
    aeson = lself.aeson_1_5_6_0;
    lens-aeson = doJailbreak lself.lens-aeson_1_1_3;
-    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
+    lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0
    hls-overloaded-record-dot-plugin = null;
  }));

-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_7_20230228;
+  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
-  ghc-lib = doDistribute self.ghc-lib_9_2_7_20230228;
+  ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;

  mod = super.mod_0_1_2_2;
  path-io = doJailbreak super.path-io;

+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
  ormolu = self.ormolu_0_5_0_1;
  fourmolu = dontCheck self.fourmolu_0_9_0_0;
  hlint = self.hlint_3_4_1;
@ -134,15 +137,6 @@ self: super: {
    parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers
  ]) super.hls-tactics-plugin);

-  hls-brittany-plugin =  unmarkBroken (addBuildDepends (with self.hls-brittany-plugin.scope; [
-    brittany czipwith extra ghc-exactprint ghcide hls-plugin-api hls-test-utils lens lsp-types
-    ]) (super.hls-brittany-plugin.overrideScope (lself: lsuper: {
-    brittany = doJailbreak (unmarkBroken lself.brittany_0_13_1_2);
-    aeson = lself.aeson_1_5_6_0;
-    multistate = unmarkBroken (dontCheck lsuper.multistate);
-    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
-  })));
-
  # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies.
  # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
  hls-haddock-comments-plugin =  unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -68,6 +68,10 @@ self: super: {
  tuple = addBuildDepend self.base-orphans super.tuple;
  vector-th-unbox = doJailbreak super.vector-th-unbox;

+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
  ormolu = self.ormolu_0_5_2_0.override {
    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
  };
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -63,6 +63,10 @@ self: super: {
    algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
  };

+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
  ormolu = self.ormolu_0_5_2_0.override {
    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
  };
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@ -68,20 +68,27 @@ self: super: {
  doctest = doDistribute super.doctest_0_22_0;
  http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18
  some = doDistribute self.some_1_0_5;
-  th-abstraction = doDistribute self.th-abstraction_0_5_0_0;
+  th-abstraction = doDistribute self.th-abstraction_0_6_0_0;
  th-desugar = doDistribute self.th-desugar_1_15;
  semigroupoids = doDistribute self.semigroupoids_6_0_0_1;
  bifunctors = doDistribute self.bifunctors_5_6_1;
  base-compat = doDistribute self.base-compat_0_13_0;
  base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;

+  # Because we bumped the version of th-abstraction above.^
+  aeson = doJailbreak super.aeson;
+  free = doJailbreak super.free;
+
+  # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6
+  file-io = unmarkBroken super.file-io;
+
  # Too strict upper bound on template-haskell
  # https://github.com/mokus0/th-extras/pull/21
  th-extras = doJailbreak super.th-extras;

  ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523;
  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523;
-  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_0;
+  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_1;

  # v0.1.6 forbids base >= 4.18
  singleton-bool = doDistribute super.singleton-bool_0_1_7;
@ -164,23 +171,14 @@ self: super: {

  # 2023-04-03: plugins disabled for hls 1.10.0.0 based on
  #
-  haskell-language-server =
-    let
-      # TODO: HLS-2.0.0.0 added support for the foumolu plugin for ghc-9.6.
-      # However, putting together all the overrides to get the latest
-      # version of fourmolu compiling together with ghc-9.6 and HLS is a
-      # little annoying, so currently fourmolu has been disabled.  We should
-      # try to enable this at some point in the future.
-      hlsWithFlags = disableCabalFlag "fourmolu" super.haskell-language-server;
-    in
-    hlsWithFlags.override {
-      hls-ormolu-plugin = null;
+  haskell-language-server = super.haskell-language-server.override {
      hls-floskell-plugin = null;
-      hls-fourmolu-plugin = null;
-      hls-hlint-plugin = null;
-      hls-stylish-haskell-plugin = null;
    };

+  fourmolu = super.fourmolu_0_13_1_0;
+  ormolu = super.ormolu_0_7_1_0;
+  stylish-haskell = super.stylish-haskell_0_14_5_0;
+
  # Newer version of servant required for GHC 9.6
  servant = self.servant_0_20;
  servant-server = self.servant-server_0_20;
@ -216,6 +214,8 @@ self: super: {
   HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
  ]) super.ghc-exactprint_1_7_0_1);

+  hlint = super.hlint_3_6_1;
+
  inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
    hls-cabal-plugin
    algebraic-graphs
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -41,11 +41,6 @@ default-package-overrides:
  - dhall-nixpkgs == 1.0.9
  - dhall-nix == 1.1.25

-  # 2023-06-24: HLS at large can't deal with lsp-2.0.0.0 yet
-  - lsp == 1.6.*
-  - lsp-types == 1.6.*
-  - lsp-test == 0.14.*
-
  # 2023-07-06: ghcide-2.0.0.1 explicitly needs implicit-hie < 0.1.3, because some sort of
  # breaking change was introduced in implicit-hie-0.1.3.0.
  # https://github.com/haskell/haskell-language-server/blob/feb596592de95f09cf4ee885f3e74178161919f1/ghcide/ghcide.cabal#L107-L111
@ -112,6 +107,7 @@ extra-packages:
  - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
  - hspec-meta < 2.8                    # 2022-12-07: Needed for elmPackages.elm / hspec-discover
  - hspec-golden == 0.1.*               # 2022-04-07: Needed for elm-format
+  - http2 < 3.3                         # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5>
  - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
  - language-docker == 11.0.0           # required by hadolint 2.12.0, 2022-11-16
  - language-javascript == 0.7.0.0      # required by purescript
@ -132,6 +128,7 @@ extra-packages:
  - sbv == 7.13                         # required for pkgs.petrinizer
  - stylish-haskell == 0.14.3.0         # 2022-09-19: needed for hls on ghc 8.8
  - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
+  - th-abstraction < 0.6                # 2023-09-11: needed for aeson-2.2.0.0
  - vty == 5.35.1                       # 2022-07-08: needed for glirc-2.39.0.1
  - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
  - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
@ -173,6 +170,7 @@ package-maintainers:
    - patat
    - svgcairo
  danielrolls:
+    - byte-count-reader
    - shellify
  domenkozar:
    - cachix
@ -580,6 +578,8 @@ unsupported-platforms:
  bustle:                                       [ platforms.darwin ] # uses glibc-specific ptsname_r
  bytelog:                                      [ platforms.darwin ] # due to posix-api
  camfort:                                      [ aarch64-linux ]
+  chalkboard:                                   [ platforms.darwin ] # depends on Codec-Image-DevIL
+  chalkboard-viewer:                            [ platforms.darwin ] # depends on chalkboard
  charsetdetect:                                [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
  Codec-Image-DevIL:                            [ platforms.darwin ] # depends on mesa
  coinor-clp:                                   [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp
@ -596,6 +596,7 @@ unsupported-platforms:
  gi-dbusmenugtk3:                              [ platforms.darwin ]
  gi-dbusmenu:                                  [ platforms.darwin ]
  gi-ggit:                                      [ platforms.darwin ]
+  gi-gtk-layer-shell:                           [ platforms.darwin ] # depends on gtk-layer-shell which is not supported on darwin
  gi-ibus:                                      [ platforms.darwin ]
  gi-javascriptcore:                            [ platforms.darwin ] # webkitgtk marked broken on darwin
  gi-ostree:                                    [ platforms.darwin ]
@ -610,7 +611,6 @@ unsupported-platforms:
  gtk-sni-tray:                                 [ platforms.darwin ]
  h-raylib:                                     [ platforms.darwin ] # depends on mesa
  haskell-snake:                                [ platforms.darwin ]
-  hb3sum:                                       [ aarch64-linux ] # depends on blake3, which is not supported on aarch64-linux
  hcwiid:                                       [ platforms.darwin ]
  HDRUtils:                                     [ platforms.darwin ]
  hidapi:                                       [ platforms.darwin ]
@ -664,6 +664,7 @@ unsupported-platforms:
  SDL-mpeg:                                     [ platforms.darwin ] # depends on mesa
  sdl2-mixer:                                   [ platforms.darwin ]
  sdl2-ttf:                                     [ platforms.darwin ]
+  sdr:                                          [ platforms.darwin ] # depends on rtlsdr
  sensei:                                       [ platforms.darwin ]
  spade:                                        [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin
  synthesizer-alsa:                             [ platforms.darwin ]
@ -711,12 +712,14 @@ supported-platforms:
  gtk3-mac-integration:                         [ platforms.darwin ]
  halide-haskell:                               [ platforms.linux ]
  halide-JuicyPixels:                           [ platforms.linux ]
+  hb3sum:                                       [ platforms.x86 ] # due to blake3
  hommage-ds:                                   [ platforms.windows ]
  hpapi:                                        [ platforms.linux ] # limited by pkgs.papi
  hsignal:                                      [ platforms.x86 ] # -msse2
  HFuse:                                        [ platforms.linux ]
  HQu:                                          [ platforms.x86 ] # vendored C++ library needs i686/x86_64
  hs-swisstable-hashtables-class:               [ platforms.x86_64 ] # depends on swisstable, which Needs AVX2
+  htune:                                        [ platforms.linux ] # depends on alsa-pcm
  hw-prim-bits:                                 [ platforms.x86 ] # x86 assembler
  inline-asm:                                   [ platforms.x86 ] # x86 assembler
  keid-core:                                    [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
@ -844,7 +847,9 @@ dont-distribute-packages:

  # Packages that (transitively) depend on insecure packages
  - distributed-process-zookeeper # depends on hzk
+  - HDRUtils # depends on pfstools, which depends on imagemagick
  - hzk # depends on zookeeper_mt, which depends on openssl-1.1
-  - persistent-zookeper # depends on hzk
+  - jobqueue # depends on hzk
+  - persistent-zookeeper # depends on hzk
  - pocket-dns # depends on persistent-zookeeper
  - zoovisitor # depends on zookeeper_mt, which depends on openssl-1.1
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 21.3
+# Stackage LTS 21.7
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -8,7 +8,7 @@ default-package-overrides:
  - AC-Angle ==1.0
  - acc ==0.2.0.2
  - ace ==0.6
-  - acid-state ==0.16.1.2
+  - acid-state ==0.16.1.3
  - action-permutations ==0.0.0.1
  - active ==0.2.0.18
  - ad ==4.5.4
@ -104,11 +104,12 @@ default-package-overrides:
  - atomic-primops ==0.8.4
  - atomic-write ==0.2.0.7
  - attoparsec ==0.14.4
+  - attoparsec-aeson ==2.1.0.0
  - attoparsec-base64 ==0.0.0
  - attoparsec-binary ==0.2
  - attoparsec-data ==1.0.5.3
  - attoparsec-expr ==0.1.1.2
-  - attoparsec-framer ==0.1.0.0
+  - attoparsec-framer ==0.1.0.1
  - attoparsec-iso8601 ==1.1.0.0
  - attoparsec-path ==0.0.0.1
  - attoparsec-run ==0.0.2.0
@ -116,7 +117,7 @@ default-package-overrides:
  - audacity ==0.0.2.1
  - authenticate ==1.3.5.1
  - authenticate-oauth ==1.7
-  - autodocodec ==0.2.0.3
+  - autodocodec ==0.2.0.4
  - autodocodec-openapi3 ==0.2.1.1
  - autodocodec-schema ==0.1.0.3
  - autodocodec-yaml ==0.2.0.3
@ -166,7 +167,7 @@ default-package-overrides:
  - benri-hspec ==0.1.0.1
  - between ==0.11.0.0
  - bhoogle ==0.1.4.2
-  - bibtex ==0.1.0.6
+  - bibtex ==0.1.0.7
  - bifunctor-classes-compat ==0.1
  - bifunctors ==5.5.15
  - bimap ==0.5.0
@ -195,7 +196,7 @@ default-package-overrides:
  - bitset-word8 ==0.1.1.2
  - bits-extra ==0.0.2.3
  - bitvec ==1.1.4.0
-  - bitwise-enum ==1.0.1.0
+  - bitwise-enum ==1.0.1.2
  - blake2 ==0.3.0
  - Blammo ==1.1.2.1
  - blank-canvas ==0.7.3
@ -215,7 +216,7 @@ default-package-overrides:
  - bm ==0.2.0.0
  - bmp ==1.2.6.3
  - bnb-staking-csvs ==0.2.1.0
-  - BNFC ==2.9.4.1
+  - BNFC ==2.9.5
  - BNFC-meta ==0.6.1
  - board-games ==0.4
  - bodhi ==0.1.0
@ -226,11 +227,11 @@ default-package-overrides:
  - boots ==0.2.0.1
  - bordacount ==0.1.0.0
  - boring ==0.2.1
-  - bound ==2.0.6
+  - bound ==2.0.7
  - BoundedChan ==1.0.3.0
  - bounded-queue ==1.0.0
  - boundingboxes ==0.2.3
-  - box ==0.9.1
+  - box ==0.9.2.0
  - boxes ==0.1.5
  - breakpoint ==0.1.2.1
  - brick ==1.9
@ -251,16 +252,16 @@ default-package-overrides:
  - burrito ==2.0.1.6
  - bv ==0.5
  - byteable ==0.1.1
-  - bytebuild ==0.3.13.0
+  - bytebuild ==0.3.14.0
  - byte-count-reader ==0.10.1.10
  - bytedump ==1.0
  - bytehash ==0.1.0.0
  - byte-order ==0.1.3.0
  - byteorder ==1.0.4
-  - bytes ==0.17.2
+  - bytes ==0.17.3
  - byteset ==0.1.1.0
-  - byteslice ==0.2.10.0
-  - bytesmith ==0.3.9.1
+  - byteslice ==0.2.11.1
+  - bytesmith ==0.3.10.0
  - bytestring-builder ==0.10.8.2.0
  - bytestring-lexing ==0.5.0.10
  - bytestring-mmap ==0.2.2
@ -270,7 +271,7 @@ default-package-overrides:
  - bytestring-trie ==0.2.7.2
  - bz2 ==1.0.1.0
  - bzlib-conduit ==0.3.0.2
-  - c14n ==0.1.0.2
+  - c14n ==0.1.0.3
  - c2hs ==0.28.8
  - cabal2spec ==2.7.0
  - cabal-appimage ==0.4.0.1
@ -278,7 +279,7 @@ default-package-overrides:
  - cabal-doctest ==1.0.9
  - cabal-file ==0.1.1
  - cabal-install-solver ==3.8.1.0
-  - cabal-rpm ==2.1.1
+  - cabal-rpm ==2.1.2
  - cache ==0.1.3.0
  - cached-json-file ==0.1.1
  - cacophony ==0.10.1
@ -316,7 +317,7 @@ default-package-overrides:
  - cgi ==3001.5.0.1
  - chan ==0.0.4.1
  - character-cases ==0.1.0.6
-  - charset ==0.3.9
+  - charset ==0.3.10
  - charsetdetect-ae ==1.1.0.4
  - Chart ==1.9.4
  - Chart-diagrams ==1.9.4
@ -336,13 +337,13 @@ default-package-overrides:
  - circle-packing ==0.1.0.6
  - circular ==0.4.0.3
  - citeproc ==0.8.1
-  - classy-prelude ==1.5.0.2
+  - classy-prelude ==1.5.0.3
  - classy-prelude-conduit ==1.5.0
  - classy-prelude-yesod ==1.5.0
  - cleff ==0.3.3.0
-  - clientsession ==0.9.1.2
+  - clientsession ==0.9.2.0
  - Clipboard ==2.3.2.0
-  - clock ==0.8.3
+  - clock ==0.8.4
  - closed ==0.2.0.2
  - clumpiness ==0.17.0.2
  - ClustalParser ==1.3.0
@ -461,6 +462,7 @@ default-package-overrides:
  - cryptohash-sha256 ==0.11.102.1
  - cryptohash-sha512 ==0.11.102.0
  - crypton ==0.32
+  - crypton-conduit ==0.2.3
  - cryptonite ==0.30
  - cryptonite-conduit ==0.2.2
  - cryptonite-openssl ==0.7
@ -519,7 +521,7 @@ default-package-overrides:
  - data-hash ==0.2.0.1
  - data-interval ==2.1.1
  - data-inttrie ==0.1.4
-  - data-lens-light ==0.1.2.3
+  - data-lens-light ==0.1.2.4
  - data-memocombinators ==0.5.1
  - data-msgpack ==0.0.13
  - data-msgpack-types ==0.0.3
@ -555,7 +557,7 @@ default-package-overrides:
  - derive-storable ==0.3.1.0
  - derive-topdown ==0.0.3.0
  - deriving-aeson ==0.2.9
-  - deriving-compat ==0.6.3
+  - deriving-compat ==0.6.5
  - deriving-trans ==0.5.2.0
  - detour-via-sci ==1.0.0
  - df1 ==0.4.1
@ -597,7 +599,7 @@ default-package-overrides:
  - distributive ==0.6.2.1
  - diversity ==0.8.1.0
  - djinn-lib ==0.0.1.4
-  - dl-fedora ==0.9.5
+  - dl-fedora ==0.9.5.1
  - dlist ==1.0
  - dlist-instances ==0.1.1.1
  - dlist-nonempty ==0.1.3
@ -609,7 +611,7 @@ default-package-overrides:
  - doctest-discover ==0.2.0.0
  - doctest-driver-gen ==0.3.0.7
  - doctest-exitcode-stdio ==0.0
-  - doctest-extract ==0.1.1
+  - doctest-extract ==0.1.1.1
  - doctest-lib ==0.1
  - doctest-parallel ==0.3.0.1
  - doldol ==0.4.1.2
@ -634,7 +636,7 @@ default-package-overrides:
  - dsp ==0.2.5.2
  - dual ==0.1.1.1
  - dual-tree ==0.2.3.1
-  - dublincore-xml-conduit ==0.1.0.2
+  - dublincore-xml-conduit ==0.1.0.3
  - dunai ==0.11.1
  - duration ==0.2.0.0
  - dvorak ==0.1.0.0
@ -674,8 +676,8 @@ default-package-overrides:
  - elynx-tools ==0.7.2.1
  - elynx-tree ==0.7.2.2
  - emacs-module ==0.1.1.1
-  - email-validate ==2.3.2.18
-  - emojis ==0.1.2
+  - email-validate ==2.3.2.19
+  - emojis ==0.1.3
  - enclosed-exceptions ==1.0.3
  - ENIG ==0.0.1.0
  - entropy ==0.4.1.10
@ -698,7 +700,7 @@ default-package-overrides:
  - errors ==2.3.0
  - errors-ext ==0.4.2
  - ersatz ==0.4.13
-  - esqueleto ==3.5.10.0
+  - esqueleto ==3.5.10.1
  - event-list ==0.1.2
  - eventstore ==1.4.2
  - every ==0.0.1
@ -753,7 +755,7 @@ default-package-overrides:
  - fields-json ==0.4.0.0
  - file-embed ==0.0.15.0
  - file-embed-lzma ==0.0.1
-  - filelock ==0.1.1.6
+  - filelock ==0.1.1.7
  - filemanip ==0.3.6.3
  - file-modules ==0.1.2.4
  - filepath-bytestring ==1.4.2.1.13
@ -838,7 +840,7 @@ default-package-overrides:
  - generic-constraints ==1.1.1.1
  - generic-data ==1.1.0.0
  - generic-data-surgery ==0.3.0.0
-  - generic-deriving ==1.14.4
+  - generic-deriving ==1.14.5
  - generic-functor ==1.1.0.0
  - generic-lens ==2.2.2.0
  - generic-lens-core ==2.2.1.0
@ -892,8 +894,8 @@ default-package-overrides:
  - ghci-hexcalc ==0.1.1.0
  - ghcjs-codemirror ==0.0.0.2
  - ghcjs-perch ==0.3.3.3
-  - ghc-lib ==9.4.5.20230430
-  - ghc-lib-parser ==9.4.5.20230430
+  - ghc-lib ==9.4.6.20230808
+  - ghc-lib-parser ==9.4.6.20230808
  - ghc-lib-parser-ex ==9.4.0.0
  - ghc-paths ==0.1.0.12
  - ghc-prof ==1.4.1.12
@ -999,7 +1001,7 @@ default-package-overrides:
  - harp ==0.4.3.6
  - HasBigDecimal ==0.2.0.0
  - hasbolt ==0.1.6.2
-  - hashable ==1.4.2.0
+  - hashable ==1.4.3.0
  - hashing ==0.1.1.0
  - hashmap ==1.3.3
  - hashtables ==1.3.1
@ -1018,7 +1020,7 @@ default-package-overrides:
  - haskoin-node ==0.18.1
  - haskoin-store-data ==0.65.5
  - hasktags ==0.72.0
-  - hasql ==1.6.3
+  - hasql ==1.6.3.2
  - hasql-dynamic-statements ==0.3.1.2
  - hasql-implicits ==0.1.1
  - hasql-interpolate ==0.1.0.4
@ -1054,7 +1056,7 @@ default-package-overrides:
  - hedis ==0.15.2
  - hedn ==0.3.0.4
  - heist ==1.1.1.1
-  - here ==1.2.13
+  - here ==1.2.14
  - heredoc ==0.2.0.0
  - heterocephalus ==1.0.5.7
  - hetzner ==0.2.1.1
@ -1126,7 +1128,7 @@ default-package-overrides:
  - hset ==2.2.0
  - hs-GeoIP ==0.3
  - hsignal ==0.2.7.5
-  - hsini ==0.5.1.2
+  - hsini ==0.5.2.1
  - hsinstall ==2.8
  - HSlippyMap ==3.0.1
  - hslogger ==1.3.1.0
@ -1156,7 +1158,7 @@ default-package-overrides:
  - hspec-core ==2.10.10
  - hspec-discover ==2.10.10
  - hspec-expectations ==0.8.2
-  - hspec-expectations-json ==1.0.0.7
+  - hspec-expectations-json ==1.0.2.0
  - hspec-expectations-lifted ==0.10.0
  - hspec-expectations-pretty-diff ==0.7.2.6
  - hspec-golden ==0.2.1.0
@ -1256,7 +1258,7 @@ default-package-overrides:
  - hxt-regex-xmlschema ==9.2.0.7
  - hxt-tagsoup ==9.1.4
  - hxt-unicode ==9.0.2.4
-  - hybrid-vectors ==0.2.3
+  - hybrid-vectors ==0.2.4
  - hyper ==0.2.1.1
  - hyperloglog ==0.4.6
  - hyphenation ==0.8.2
@ -1298,7 +1300,7 @@ default-package-overrides:
  - integer-roots ==1.0.2.0
  - integer-types ==0.1.4.0
  - integration ==0.2.1
-  - intern ==0.9.4
+  - intern ==0.9.5
  - interpolate ==0.2.1
  - interpolatedstring-perl6 ==1.0.2
  - interpolation ==0.1.1.2
@ -1306,7 +1308,7 @@ default-package-overrides:
  - IntervalMap ==0.6.2.1
  - intervals ==0.9.2
  - intset-imperative ==0.1.0.0
-  - invariant ==0.6.1
+  - invariant ==0.6.2
  - invert ==1.0.0.4
  - invertible-grammar ==0.1.3.4
  - io-machine ==0.2.0.0
@ -1366,7 +1368,7 @@ default-package-overrides:
  - kazura-queue ==0.1.0.4
  - kdt ==0.2.5
  - keep-alive ==0.2.1.0
-  - keter ==2.1.1
+  - keter ==2.1.2
  - keycode ==0.2.2
  - keyed-vals ==0.2.2.0
  - keyed-vals-hspec-tests ==0.2.2.0
@ -1376,7 +1378,7 @@ default-package-overrides:
  - ki ==1.0.1.0
  - kind-apply ==0.4.0.0
  - kind-generics ==0.5.0.0
-  - kind-generics-th ==0.2.3.2
+  - kind-generics-th ==0.2.3.3
  - ki-unlifted ==1.0.0.1
  - kleene ==0.1
  - kmeans ==0.1.3
@ -1428,11 +1430,11 @@ default-package-overrides:
  - lens-properties ==4.11.1
  - lens-regex ==0.1.3
  - lens-regex-pcre ==1.1.0.0
-  - lentil ==1.5.5.4
+  - lentil ==1.5.6.0
  - LetsBeRational ==1.0.0.0
  - leveldb-haskell ==0.6.5
  - lexer-applicative ==2.1.0.2
-  - libBF ==0.6.5.1
+  - libBF ==0.6.6
  - libffi ==0.2.1
  - libgit ==0.3.1
  - liboath-hs ==0.0.1.2
@ -1570,7 +1572,7 @@ default-package-overrides:
  - misfortune ==0.1.2.1
  - missing-foreign ==0.1.1
  - MissingH ==1.6.0.0
-  - mixed-types-num ==0.5.11
+  - mixed-types-num ==0.5.12
  - mmap ==0.5.9
  - mmark ==0.0.7.6
  - mmark-cli ==0.0.5.1
@ -1692,7 +1694,7 @@ default-package-overrides:
  - network-messagepack-rpc ==0.1.2.0
  - network-messagepack-rpc-websocket ==0.1.1.1
  - network-multicast ==0.3.2
-  - Network-NineP ==0.4.7.2
+  - Network-NineP ==0.4.7.3
  - network-run ==0.2.6
  - network-simple ==0.4.5
  - network-simple-tls ==0.4.1
@ -1799,7 +1801,7 @@ default-package-overrides:
  - pandoc-plot ==1.7.0
  - pandoc-symreg ==0.2.0.0
  - pandoc-throw ==0.1.0.0
-  - pandoc-types ==1.23.0.1
+  - pandoc-types ==1.23.1
  - pango ==0.13.10.0
  - pantry ==0.8.3
  - parallel ==3.2.2.0
@ -1966,7 +1968,7 @@ default-package-overrides:
  - profunctors ==5.6.2
  - projectroot ==0.2.0.1
  - project-template ==0.2.1.0
-  - prometheus-client ==1.1.0
+  - prometheus-client ==1.1.1
  - prometheus-metrics-ghc ==1.0.1.2
  - promises ==0.3
  - prompt ==0.1.1.2
@ -2049,7 +2051,7 @@ default-package-overrides:
  - rawfilepath ==1.0.1
  - rawstring-qm ==0.2.3.0
  - raw-strings-qq ==1.1
-  - rcu ==0.2.6
+  - rcu ==0.2.7
  - rdf ==0.1.0.7
  - rdtsc ==1.3.0.1
  - re2 ==0.3
@ -2090,7 +2092,7 @@ default-package-overrides:
  - regex-pcre-builtin ==0.95.2.3.8.44
  - regex-posix ==0.96.0.1
  - regex-posix-clib ==2.7
-  - regex-tdfa ==1.3.2.1
+  - regex-tdfa ==1.3.2.2
  - regex-with-pcre ==1.1.0.2
  - reinterpret-cast ==0.1.0
  - rel8 ==1.4.1.0
@ -2170,7 +2172,7 @@ default-package-overrides:
  - sandwich-hedgehog ==0.1.3.0
  - sandwich-quickcheck ==0.1.0.7
  - sandwich-slack ==0.1.2.0
-  - sandwich-webdriver ==0.2.2.0
+  - sandwich-webdriver ==0.2.3.0
  - say ==0.1.0.1
  - sbp ==4.15.0
  - sbv ==10.2
@ -2279,10 +2281,10 @@ default-package-overrides:
  - simple-cabal ==0.1.3.1
  - simple-cmd ==0.2.7
  - simple-cmd-args ==0.1.8
-  - simple-expr ==0.1.0.2
+  - simple-expr ==0.1.1.0
  - simple-media-timestamp ==0.2.1.0
  - simple-media-timestamp-attoparsec ==0.1.0.0
-  - simple-prompt ==0.2.0.1
+  - simple-prompt ==0.2.1
  - simple-reflect ==0.3.3
  - simple-sendfile ==0.2.32
  - simple-session ==2.0.0
@ -2302,8 +2304,8 @@ default-package-overrides:
  - skein ==1.0.9.4
  - skews ==0.1.0.3
  - skip-var ==0.1.1.0
-  - skylighting ==0.13.4
-  - skylighting-core ==0.13.4
+  - skylighting ==0.13.4.1
+  - skylighting-core ==0.13.4.1
  - skylighting-format-ansi ==0.1
  - skylighting-format-blaze-html ==0.1.1
  - skylighting-format-context ==0.1.0.2
@ -2408,7 +2410,7 @@ default-package-overrides:
  - strict-base-types ==0.8
  - strict-concurrency ==0.2.4.3
  - strict-lens ==0.4.0.3
-  - strict-list ==0.1.7.1
+  - strict-list ==0.1.7.2
  - strict-tuple ==0.1.5.2
  - strict-wrapper ==0.0.0.0
  - stringable ==0.1.3
@ -2428,7 +2430,7 @@ default-package-overrides:
  - stripe-signature ==1.0.0.16
  - stripe-wreq ==1.0.1.16
  - strive ==6.0.0.9
-  - structs ==0.1.8
+  - structs ==0.1.9
  - structured ==0.1.1
  - structured-cli ==2.7.0.1
  - subcategories ==0.2.0.1
@ -2439,8 +2441,8 @@ default-package-overrides:
  - svg-tree ==0.6.2.4
  - swagger2 ==2.8.7
  - swish ==0.10.4.0
-  - syb ==0.7.2.3
-  - sydtest ==0.15.0.0
+  - syb ==0.7.2.4
+  - sydtest ==0.15.1.0
  - sydtest-aeson ==0.1.0.0
  - sydtest-amqp ==0.1.0.0
  - sydtest-autodocodec ==0.0.0.0
@ -2563,8 +2565,8 @@ default-package-overrides:
  - text-regex-replace ==0.1.1.5
  - text-rope ==0.2
  - text-short ==0.1.5
-  - text-show ==3.10.3
-  - text-show-instances ==3.9.5
+  - text-show ==3.10.4
+  - text-show-instances ==3.9.6
  - text-zipper ==0.13
  - tfp ==1.0.2
  - tf-random ==0.5
@ -2581,7 +2583,7 @@ default-package-overrides:
  - these-skinny ==0.7.5
  - th-expand-syns ==0.4.11.0
  - th-lego ==0.3.0.2
-  - th-lift ==0.8.3
+  - th-lift ==0.8.4
  - th-lift-instances ==0.1.20
  - th-nowq ==0.1.0.5
  - th-orphans ==0.13.14
@ -2632,7 +2634,7 @@ default-package-overrides:
  - token-bucket ==0.1.0.1
  - toml-reader ==0.2.1.0
  - toml-reader-parse ==0.1.1.1
-  - tophat ==1.0.5.1
+  - tophat ==1.0.6.0
  - topograph ==1.0.0.2
  - torrent ==10000.1.3
  - torsor ==0.1
@ -2650,7 +2652,7 @@ default-package-overrides:
  - tree-fun ==0.8.1.0
  - tree-view ==0.5.1
  - trie-simple ==0.4.2
-  - trifecta ==2.1.2
+  - trifecta ==2.1.3
  - trimdent ==0.1.0.0
  - triplesec ==0.2.2.1
  - trivial-constraint ==0.7.0.0
@ -2718,7 +2720,7 @@ default-package-overrides:
  - unique-logic ==0.4.0.1
  - unique-logic-tf ==0.5.1
  - unit-constraint ==0.0.0
-  - units-parser ==0.1.1.4
+  - units-parser ==0.1.1.5
  - universe ==1.2.2
  - universe-base ==1.1.3.1
  - universe-dependent-sum ==1.3
@ -2861,7 +2863,7 @@ default-package-overrides:
  - within ==0.2.0.1
  - with-location ==0.1.0
  - with-utf8 ==1.0.2.4
-  - witness ==0.6.1
+  - witness ==0.6.2
  - wizards ==1.0.3
  - wl-pprint ==1.2.1
  - wl-pprint-annotated ==0.1.0.1
@ -2873,7 +2875,7 @@ default-package-overrides:
  - word-wrap ==0.5
  - world-peace ==1.0.2.0
  - wrap ==0.0.0
-  - wreq ==0.5.4.0
+  - wreq ==0.5.4.1
  - wreq-stringless ==0.5.9.1
  - writer-cps-exceptions ==0.1.0.1
  - writer-cps-mtl ==0.1.1.6
@ -2913,26 +2915,26 @@ default-package-overrides:
  - xml-types ==0.3.8
  - xmonad ==0.17.2
  - xmonad-contrib ==0.17.1
-  - xor ==0.0.1.1
+  - xor ==0.0.1.2
  - xss-sanitize ==0.3.7.2
  - xxhash-ffi ==0.2.0.0
  - yaml ==0.11.11.2
  - yaml-unscrambler ==0.1.0.17
-  - Yampa ==0.14.3
+  - Yampa ==0.14.4
  - yarn-lock ==0.6.5
  - yeshql-core ==4.2.0.0
  - yesod ==1.6.2.1
  - yesod-auth ==1.6.11.1
  - yesod-auth-basic ==0.1.0.3
  - yesod-auth-hashdb ==1.7.1.7
-  - yesod-auth-oauth2 ==0.7.1.0
+  - yesod-auth-oauth2 ==0.7.1.1
  - yesod-auth-oidc ==0.1.4
  - yesod-bin ==1.6.2.2
-  - yesod-core ==1.6.24.3
+  - yesod-core ==1.6.24.4
  - yesod-eventsource ==1.6.0.1
  - yesod-fb ==0.6.1
  - yesod-form ==1.7.4
-  - yesod-form-bootstrap4 ==3.0.1
+  - yesod-form-bootstrap4 ==3.0.1.1
  - yesod-gitrepo ==0.3.0
  - yesod-gitrev ==0.2.2
  - yesod-markdown ==0.12.6.13
@ -2941,7 +2943,7 @@ default-package-overrides:
  - yesod-page-cursor ==2.0.1.0
  - yesod-paginator ==1.1.2.2
  - yesod-persistent ==1.6.0.8
-  - yesod-recaptcha2 ==1.0.2
+  - yesod-recaptcha2 ==1.0.2.1
  - yesod-routes-flow ==3.0.0.2
  - yesod-sitemap ==1.6.0
  - yesod-static ==1.6.1.0
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -69,7 +69,7 @@ self: super: builtins.intersectAttrs super {
        -e "s/@@GHC_VERSION@@/${self.ghc.version}/" \
        -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \
        -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \
-        -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
+        -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://nixos.org/manual/nixpkgs/unstable/#haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
        bindist/wrapper.in > "$out/bin/haskell-language-server"
      ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}"
      chmod +x "$out/bin/haskell-language-server"
@ -123,7 +123,6 @@ self: super: builtins.intersectAttrs super {
    hls-brittany-plugin
    hls-floskell-plugin
    hls-fourmolu-plugin
-    hls-cabal-plugin
    hls-overloaded-record-dot-plugin
  ;

@ -134,6 +133,7 @@ self: super: builtins.intersectAttrs super {
    hls-gadt-plugin

    # https://github.com/haskell/haskell-language-server/pull/3431
+    hls-cabal-plugin
    hls-cabal-fmt-plugin
    hls-code-range-plugin
    hls-explicit-record-fields-plugin
@ -452,6 +452,8 @@ self: super: builtins.intersectAttrs super {
  wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; };
  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; };

+  shellify = enableSeparateBinOutput super.shellify;
+
  # Test suite wants to connect to $DISPLAY.
  bindings-GLFW = dontCheck super.bindings-GLFW;
  gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
@ -599,7 +601,17 @@ self: super: builtins.intersectAttrs super {
  #
  # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate,
  # so disable this on Darwin only
-  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend pkgs.freeglut (appendPatch ./patches/GLUT.patch super.GLUT);
+  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: {
+    pkg-configDepends = drv.pkg-configDepends or [] ++ [
+      pkgs.freeglut
+    ];
+    patches = drv.patches or [] ++ [
+      ./patches/GLUT.patch
+    ];
+    prePatch = drv.prePatch or "" + ''
+      ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
+    '';
+  }) super.GLUT;

  libsystemd-journal = doJailbreak (addExtraLibrary pkgs.systemd super.libsystemd-journal);

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
+++ b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
@ -1,28 +0,0 @@
-From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Tue, 1 Sep 2015 17:58:36 +0200
-Subject: [PATCH] Revert "Fix maximum sizing calculation."
-
-This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks
-this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7
-for further details.
---
- Data/BloomFilter/Easy.hs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs
-index 5143c6e..a349168 100644
--- a/Data/BloomFilter/Easy.hs
-+++ b/Data/BloomFilter/Easy.hs
-@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate
-             minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k)
-                      | k <- [1..100]]
-         roundedBits = nextPowerOfTwo (ceiling bits)
-    in if roundedBits <= 0 || roundedBits > 0xffffffff
-+    in if roundedBits <= 0
-        then Left  "capacity too large to represent"
-        else Right (roundedBits, truncate hashes)
- 
-- 
-2.5.1
-
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
  CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";

  # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99";
+  CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99"
+    + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64";

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&

 stdenv.mkDerivation (finalAttrs: {
  pname = "igraph";
-  version = "0.10.6";
+  version = "0.10.7";

  src = fetchFromGitHub {
    owner = "igraph";
    repo = finalAttrs.pname;
    rev = finalAttrs.version;
-    hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE=";
+    hash = "sha256-1ge5V9G2jmIWQE5TW7+6cXCV9viFkhcnjpYrLQVLrgg=";
  };

  postPatch = ''
@ -92,6 +92,10 @@ stdenv.mkDerivation (finalAttrs: {
    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
  '';

+  passthru.tests = {
+    python = python3.pkgs.igraph;
+  };
+
  meta = with lib; {
    description = "C library for complex network analysis and graph theory";
    homepage = "https://igraph.org/";
--- a/pkgs/development/libraries/llhttp/default.nix
+++ b/pkgs/development/libraries/llhttp/default.nix
@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, testers }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "llhttp";
-  version = "9.1.0";
+  version = "9.1.2";

  src = fetchFromGitHub {
    owner = "nodejs";
    repo = "llhttp";
-    rev = "release/v${version}";
-    hash = "sha256-DWRo9mVpmty/Ec+pKqPTZqwOlYJD+SmddwEui7P/694=";
+    rev = "release/v${finalAttrs.version}";
+    hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ=";
  };

  nativeBuildInputs = [
@ -19,12 +19,17 @@ stdenv.mkDerivation rec {
    "-DBUILD_STATIC_LIBS=ON"
  ];

+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+  };
+
  meta = with lib; {
    description = "Port of http_parser to llparse";
    homepage = "https://llhttp.org/";
-    changelog = "https://github.com/nodejs/llhttp/releases/tag/${src.rev}";
+    changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}";
    license = licenses.mit;
+    pkgConfigModules = [ "libllhttp" ];
    maintainers = [ maintainers.marsam ];
    platforms = platforms.all;
  };
-}
+})
--- a/pkgs/development/libraries/opencomposite/cmake-use-find_package-where-needed.patch
+++ b/pkgs/development/libraries/opencomposite/cmake-use-find_package-where-needed.patch
@ -1,112 +0,0 @@
-From 5430196765402655715f759e3de0166ad3fbe1fe Mon Sep 17 00:00:00 2001
-From: Sefa Eyeoglu <contact@scrumplex.net>
-Date: Fri, 28 Jul 2023 12:26:58 +0200
-Subject: [PATCH] cmake: use find_package where needed
-
-Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
- CMakeLists.txt | 62 ++++----------------------------------------------
- 1 file changed, 4 insertions(+), 58 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb3c49a..e9d6d56 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,66 +98,13 @@ endif ()
- # === OpenXR ===
- # Building CMake subprojects is a real pain (IMO), so just build this here
- 
-set(XrDir libs/openxr-sdk)
-set(XrDirLoader libs/openxr-sdk/src/loader)
-set(XrDirCommon libs/openxr-sdk/src/common)
-if (ANDROID)
-	# Whatever consumes this library must then link to an OpenXR loader, such as the Oculus one
-	add_library(OpenXR STATIC scripts/empty.c) # Doesn't do anything
-else ()
-add_library(OpenXR STATIC
-	${XrDirLoader}/api_layer_interface.cpp
-	${XrDirLoader}/api_layer_interface.hpp
-	${XrDirLoader}/loader_core.cpp
-	${XrDirLoader}/loader_instance.cpp
-	${XrDirLoader}/loader_instance.hpp
-	${XrDirLoader}/loader_logger.cpp
-	${XrDirLoader}/loader_logger.hpp
-	${XrDirLoader}/loader_logger_recorders.cpp
-	${XrDirLoader}/loader_logger_recorders.hpp
-	${XrDirLoader}/manifest_file.cpp
-	${XrDirLoader}/manifest_file.hpp
-	${XrDirLoader}/runtime_interface.cpp
-	${XrDirLoader}/runtime_interface.hpp
-
-	${XrDirLoader}/xr_generated_loader.hpp
-	${XrDirLoader}/xr_generated_loader.cpp
-	${XrDir}/src/xr_generated_dispatch_table.h
-	${XrDir}/src/xr_generated_dispatch_table.c
-
-	${XrDirCommon}/filesystem_utils.cpp
-	${XrDirCommon}/object_info.cpp
-
-	${XrDir}/src/external/jsoncpp/src/lib_json/json_reader.cpp
-	${XrDir}/src/external/jsoncpp/src/lib_json/json_value.cpp
-	${XrDir}/src/external/jsoncpp/src/lib_json/json_writer.cpp
-)
-endif()
-target_include_directories(OpenXR PRIVATE ${XrDirCommon} ${XrDir}/src ${XrDir}/src/external/jsoncpp/include)
-target_include_directories(OpenXR PUBLIC ${XrDir}/include)
-# Platform-dependent flags
-if (WIN32)
-	target_compile_definitions(OpenXR PRIVATE -DXR_OS_WINDOWS -DXR_USE_PLATFORM_WIN32
-	-DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_GRAPHICS_API_D3D12 -DXR_USE_GRAPHICS_API_OPENGL)
-	target_link_libraries(OpenXR PUBLIC advapi32 pathcch OpenGL32)
-else()
-	# TODO Turtle1331 should we include -DXR_USE_PLATFORM_(XLIB|XCB|WAYLAND) here?
-	target_compile_definitions(OpenXR PRIVATE -DXR_OS_LINUX
-	-DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_VULKAN)
-	target_link_libraries(OpenXR PUBLIC -ldl)
-endif()
-target_link_libraries(OpenXR PUBLIC Vulkan)
-
-if (ANDROID)
-	target_compile_definitions(OpenXR PUBLIC -DXR_USE_PLATFORM_ANDROID -DXR_USE_GRAPHICS_API_OPENGL_ES)
-endif()
-+find_package(OpenXR REQUIRED)
- 
- # === glm ===
- # Since we used to use LibOVR's maths library, we need a replacement
- # glm is an obvious choice
- 
-add_library(glm INTERFACE)
-target_include_directories(glm INTERFACE libs/glm) # No separate include directory :(
-+find_package(glm REQUIRED)
- 
- # === DrvOpenXR ===
- add_library(DrvOpenXR STATIC
-@@ -189,7 +136,7 @@ add_library(DrvOpenXR STATIC
- )
- target_include_directories(DrvOpenXR PUBLIC DrvOpenXR/pub ${CMAKE_BINARY_DIR})
- target_include_directories(DrvOpenXR PRIVATE DrvOpenXR OpenOVR)
-target_link_libraries(DrvOpenXR PUBLIC OpenVR OpenXR glm)
-+target_link_libraries(DrvOpenXR PUBLIC OpenVR OpenXR::openxr_loader glm::glm)
- target_compile_definitions(DrvOpenXR PRIVATE ${GRAPHICS_API_SUPPORT_FLAGS} -D_CRT_SECURE_NO_WARNINGS)
- source_group(Public REGULAR_EXPRESSION DrvOpenXR/pub/*)
- 
-@@ -357,7 +304,7 @@ target_include_directories(OCCore PUBLIC OpenOVR ${CMAKE_BINARY_DIR})  # TODO ma
- target_include_directories(OCCore PRIVATE BundledLibs OpenVRHeaders)
- target_compile_definitions(OCCore PRIVATE ${GRAPHICS_API_SUPPORT_FLAGS})
- 
-target_link_libraries(OCCore OpenVR OpenXR Vulkan glm)
-+target_link_libraries(OCCore OpenVR OpenXR::openxr_loader Vulkan glm::glm)
- 
- if (NOT WIN32 AND NOT ANDROID)
- 	find_package(OpenGL REQUIRED) # for glGetError()
-@@ -411,7 +358,6 @@ endif ()
- if (WIN32)
- else ()
- 	target_compile_options(DrvOpenXR PRIVATE -fPIC)
-	target_compile_options(OpenXR PRIVATE -fPIC)
- 	target_compile_options(OCCore PRIVATE -fPIC)
- endif ()
- 
-- 
-2.41.0
-
--- a/pkgs/development/libraries/opencomposite/default.nix
+++ b/pkgs/development/libraries/opencomposite/default.nix
@ -15,20 +15,15 @@

 stdenv.mkDerivation {
  pname = "opencomposite";
-  version = "unstable-2023-07-02";
+  version = "unstable-2023-09-11";

  src = fetchFromGitLab {
    owner = "znixian";
    repo = "OpenOVR";
-    rev = "a59b16204a1ee61a59413667a516375071a113f0";
-    hash = "sha256-JSVd/+A/WldP+A2vOOG4lbwb4QCE/PymEm4VbjUxWrw=";
+    rev = "cca18158a4b6921df54e84a3b23ff459f76a2bde";
+    hash = "sha256-VREApt4juz283aJVLZoBbqg01PNs4XBxmpr/UIMlaK8=";
  };

-  patches = [
-    # Force OpenComposite to use our OpenXR and glm, instead of its Git submodules
-    ./cmake-use-find_package-where-needed.patch
-  ];
-
  nativeBuildInputs = [
    cmake
  ];
@ -43,6 +38,11 @@ stdenv.mkDerivation {
    xorg.libX11
  ];

+  cmakeFlags = [
+    "-DUSE_SYSTEM_OPENXR=ON"
+    "-DUSE_SYSTEM_GLM=ON"
+  ];
+
  installPhase = ''
    runHook preInstall
    mkdir -p $out/lib/opencomposite
--- a/pkgs/development/misc/haskell/hasura/ekg-core.nix
+++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix
@ -29,5 +29,7 @@ mkDerivation {
  homepage = "https://github.com/tibbe/ekg-core";
  description = "Tracking of system metrics";
  license = lib.licenses.bsd3;
+  hydraPlatforms = lib.platforms.none;
  maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }
--- a/pkgs/development/misc/haskell/hasura/ekg-json.nix
+++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix
@ -21,5 +21,7 @@ mkDerivation {
  homepage = "https://github.com/tibbe/ekg-json";
  description = "JSON encoding of ekg metrics";
  license = lib.licenses.bsd3;
+  hydraPlatforms = lib.platforms.none;
  maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }
--- a/pkgs/development/misc/haskell/hasura/pg-client.nix
+++ b/pkgs/development/misc/haskell/hasura/pg-client.nix
@ -33,5 +33,7 @@ mkDerivation {
  ];
  homepage = "https://github.com/hasura/platform";
  license = lib.licenses.asl20;
+  hydraPlatforms = lib.platforms.none;
  maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@ -108,6 +108,7 @@ mapAliases {
  "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
  ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
  stf = throw "stf was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) stylelint; # added 2023-09-13
  surge = pkgs.surge-cli; # Added 2023-09-08
  swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
  inherit (pkgs) terser; # Added 2023-08-31
@ -117,6 +118,7 @@ mapAliases {
  triton = pkgs.triton; # Added 2023-05-06
  typescript = pkgs.typescript; # Added 2023-06-21
  inherit (pkgs) ungit; # added 2023-08-20
+  inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
  vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27
  vue-cli = self."@vue/cli"; # added 2023-08-18
  vue-language-server = self.vls; # added 2023-08-20
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@ -61,7 +61,6 @@
  typescript-language-server = "typescript-language-server";
  uglify-js = "uglifyjs";
  undollar = "$";
-  vsc-leetcode-cli = "leetcode";
  vscode-css-languageserver-bin = "css-languageserver";
  vscode-html-languageserver-bin = "html-languageserver";
  vscode-json-languageserver-bin = "json-languageserver";
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -160,7 +160,6 @@
 , "katex"
 , "keyoxide"
 , "lcov-result-merger"
-, "vsc-leetcode-cli"
 , "lerna"
 , "less"
 , "less-plugin-clean-css"
@ -234,7 +233,6 @@
 , "speed-test"
 , "sql-formatter"
 , "stackdriver-statsd-backend"
-, "stylelint"
 , "svelte-check"
 , "svelte-language-server"
 , "svgo"
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@ -94522,241 +94522,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
-  vsc-leetcode-cli = nodeEnv.buildNodePackage {
-    name = "vsc-leetcode-cli";
-    packageName = "vsc-leetcode-cli";
-    version = "2.8.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vsc-leetcode-cli/-/vsc-leetcode-cli-2.8.1.tgz";
-      sha512 = "C5q5wGeedHKJzs53/jrVWEeobRteB/libKrVHmLqE3zraKJBgteUN4LUNEYrAjU9O6yxgj/NPEWOLoEdRhwATw==";
-    };
-    dependencies = [
-      sources."abab-1.0.4"
-      sources."acorn-2.7.0"
-      sources."acorn-globals-1.0.9"
-      sources."ajv-6.12.6"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-3.2.1"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-1.5.2"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.12.0"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."boolbase-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."camelcase-5.3.1"
-      sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
-      sources."cheerio-0.20.0"
-      sources."cli-cursor-2.1.0"
-      sources."cli-spinners-1.3.1"
-      sources."cliui-7.0.4"
-      sources."clone-1.0.4"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colors-1.4.0"
-      sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.3"
-      sources."css-select-1.2.0"
-      sources."css-what-2.1.3"
-      sources."cssom-0.3.8"
-      sources."cssstyle-0.2.37"
-      sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
-      sources."decamelize-1.2.0"
-      sources."deep-equal-0.2.2"
-      sources."deep-is-0.1.4"
-      sources."defaults-1.0.4"
-      sources."delayed-stream-1.0.0"
-      sources."dom-serializer-0.1.1"
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-8.0.0"
-      sources."entities-1.1.2"
-      sources."escalade-3.1.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.14.3"
-      sources."esprima-4.0.1"
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."eyes-0.1.8"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."find-up-4.1.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."get-caller-file-2.0.5"
-      sources."getpass-0.1.7"
-      sources."glob-7.2.3"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-flag-3.0.0"
-      sources."he-1.2.0"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."entities-1.0.0"
-        ];
-      })
-      sources."http-signature-1.2.0"
-      sources."i-0.3.7"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-0.0.1"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."jsdom-7.2.2"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."levn-0.3.0"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."log-symbols-2.2.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-1.0.4"
-      sources."moment-2.29.4"
-      sources."mute-stream-0.0.8"
-      (sources."nconf-0.11.4" // {
-        dependencies = [
-          sources."yargs-16.2.0"
-        ];
-      })
-      sources."ncp-1.0.1"
-      sources."nth-check-1.0.2"
-      sources."nwmatcher-1.4.4"
-      sources."oauth-sign-0.9.0"
-      sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      sources."optionator-0.8.3"
-      (sources."ora-3.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."parse5-1.5.1"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
-      sources."pkginfo-0.4.1"
-      sources."prelude-ls-1.1.2"
-      sources."prompt-1.0.0"
-      sources."psl-1.9.0"
-      sources."punycode-2.3.0"
-      sources."qs-6.5.3"
-      sources."read-1.0.7"
-      sources."readable-stream-1.1.14"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
-        ];
-      })
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."restore-cursor-2.0.0"
-      sources."revalidator-0.1.8"
-      sources."rimraf-2.7.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."secure-keys-1.0.0"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."source-map-0.6.1"
-      sources."sshpk-1.17.0"
-      sources."stack-trace-0.0.10"
-      sources."string-width-4.2.3"
-      sources."string_decoder-0.10.31"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-5.5.0"
-      sources."symbol-tree-3.2.4"
-      sources."tough-cookie-2.5.0"
-      sources."tr46-0.0.3"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-check-0.3.2"
-      sources."underscore-1.9.1"
-      sources."uri-js-4.4.1"
-      (sources."utile-0.3.0" // {
-        dependencies = [
-          sources."async-0.9.2"
-          sources."mkdirp-0.5.6"
-        ];
-      })
-      sources."uuid-3.4.0"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."core-util-is-1.0.2"
-        ];
-      })
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-2.0.1"
-      sources."whatwg-url-compat-0.6.5"
-      sources."which-module-2.0.1"
-      (sources."winston-2.1.1" // {
-        dependencies = [
-          sources."async-1.0.0"
-          sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
-        ];
-      })
-      sources."word-wrap-1.2.5"
-      sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-7.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."xml-name-validator-2.0.1"
-      sources."y18n-5.0.8"
-      (sources."yargs-15.4.1" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."cliui-6.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."wrap-ansi-6.2.0"
-          sources."y18n-4.0.3"
-          sources."yargs-parser-18.1.3"
-        ];
-      })
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A cli tool to enjoy leetcode!";
-      homepage = "https://github.com/leetcode-tools/leetcode-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
  lerna = nodeEnv.buildNodePackage {
    name = "lerna";
    packageName = "lerna";
@ -105377,208 +105142,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
-  stylelint = nodeEnv.buildNodePackage {
-    name = "stylelint";
-    packageName = "stylelint";
-    version = "15.10.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz";
-      sha512 = "aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.22.10"
-      sources."@babel/helper-validator-identifier-7.22.5"
-      sources."@babel/highlight-7.22.10"
-      sources."@csstools/css-parser-algorithms-2.3.1"
-      sources."@csstools/css-tokenizer-2.2.0"
-      sources."@csstools/media-query-list-parser-2.1.4"
-      sources."@csstools/selector-specificity-3.0.0"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@types/minimist-1.2.2"
-      sources."@types/normalize-package-data-2.4.1"
-      sources."ajv-8.12.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-3.2.1"
-      sources."argparse-2.0.1"
-      sources."array-union-2.1.0"
-      sources."arrify-1.0.1"
-      sources."astral-regex-2.0.0"
-      sources."balanced-match-2.0.0"
-      (sources."brace-expansion-1.1.11" // {
-        dependencies = [
-          sources."balanced-match-1.0.2"
-        ];
-      })
-      sources."braces-3.0.2"
-      sources."callsites-3.1.0"
-      sources."camelcase-6.3.0"
-      sources."camelcase-keys-7.0.2"
-      sources."chalk-2.4.2"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colord-2.9.3"
-      sources."concat-map-0.0.1"
-      sources."cosmiconfig-8.2.0"
-      sources."css-functions-list-3.2.0"
-      sources."css-tree-2.3.1"
-      sources."cssesc-3.0.0"
-      sources."debug-4.3.4"
-      sources."decamelize-5.0.1"
-      (sources."decamelize-keys-1.1.1" // {
-        dependencies = [
-          sources."decamelize-1.2.0"
-          sources."map-obj-1.0.1"
-        ];
-      })
-      sources."dir-glob-3.0.1"
-      sources."emoji-regex-8.0.0"
-      sources."error-ex-1.3.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.3.1"
-      sources."fastest-levenshtein-1.0.16"
-      sources."fastq-1.15.0"
-      sources."file-entry-cache-6.0.1"
-      sources."fill-range-7.0.1"
-      sources."find-up-5.0.0"
-      sources."flat-cache-3.0.4"
-      sources."flatted-3.2.7"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-modules-2.0.0"
-      sources."global-prefix-3.0.0"
-      sources."globby-11.1.0"
-      sources."globjoin-0.1.4"
-      sources."hard-rejection-2.1.0"
-      sources."has-1.0.3"
-      sources."has-flag-3.0.0"
-      sources."hosted-git-info-4.1.0"
-      sources."html-tags-3.3.1"
-      sources."ignore-5.2.4"
-      (sources."import-fresh-3.3.0" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
-      sources."import-lazy-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-5.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.0"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-plain-object-5.0.0"
-      sources."isexe-2.0.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-4.1.0"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."kind-of-6.0.3"
-      sources."known-css-properties-0.28.0"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-6.0.0"
-      sources."lodash.truncate-4.4.2"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      sources."mathml-tag-names-2.1.3"
-      sources."mdn-data-2.0.30"
-      sources."meow-10.1.5"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.5"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-options-4.1.0"
-      sources."ms-2.1.2"
-      sources."nanoid-3.3.6"
-      sources."normalize-package-data-3.0.3"
-      sources."normalize-path-3.0.0"
-      sources."once-1.4.0"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-type-4.0.0"
-      sources."picocolors-1.0.0"
-      sources."picomatch-2.3.1"
-      sources."postcss-8.4.28"
-      sources."postcss-resolve-nested-selector-0.1.1"
-      sources."postcss-safe-parser-6.0.0"
-      sources."postcss-selector-parser-6.0.13"
-      sources."postcss-value-parser-4.2.0"
-      sources."punycode-2.3.0"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-5.1.1"
-      sources."read-pkg-6.0.0"
-      sources."read-pkg-up-8.0.0"
-      sources."redent-4.0.0"
-      sources."require-from-string-2.0.2"
-      sources."resolve-from-5.0.0"
-      sources."reusify-1.0.4"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."semver-7.5.4"
-      sources."signal-exit-4.1.0"
-      sources."slash-3.0.0"
-      (sources."slice-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
-      sources."source-map-js-1.0.2"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.13"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."strip-indent-4.0.0"
-      sources."style-search-0.1.0"
-      sources."supports-color-5.5.0"
-      (sources."supports-hyperlinks-3.0.0" // {
-        dependencies = [
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.2.0"
-        ];
-      })
-      sources."svg-tags-1.0.0"
-      sources."table-6.8.1"
-      sources."to-regex-range-5.0.1"
-      sources."trim-newlines-4.1.1"
-      sources."type-fest-1.4.0"
-      sources."uri-js-4.4.1"
-      sources."util-deprecate-1.0.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."which-1.3.1"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-5.0.1"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-20.2.9"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A mighty CSS linter that helps you avoid errors and enforce conventions.";
-      homepage = "https://stylelint.io";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
  svelte-check = nodeEnv.buildNodePackage {
    name = "svelte-check";
    packageName = "svelte-check";
--- a/pkgs/development/python-modules/amcrest/default.nix
+++ b/pkgs/development/python-modules/amcrest/default.nix
@ -14,14 +14,16 @@

 buildPythonPackage rec {
  pname = "amcrest";
-  version = "1.9.7";
-  disabled = pythonOlder "3.6";
+  version = "1.9.8";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "tchellomello";
    repo = "python-amcrest";
-    rev = version;
-    hash = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-v0jWEZo06vltEq//suGrvJ/AeeDxUG5CCFhbf03q34w=";
  };

  propagatedBuildInputs = [
@ -38,11 +40,14 @@ buildPythonPackage rec {
    responses
  ];

-  pythonImportsCheck = [ "amcrest" ];
+  pythonImportsCheck = [
+    "amcrest"
+  ];

  meta = with lib; {
    description = "Python module for Amcrest and Dahua Cameras";
    homepage = "https://github.com/tchellomello/python-amcrest";
+    changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${version}";
    license = with licenses; [ gpl2Only ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "async-upnp-client";
-  version = "0.35.0";
+  version = "0.35.1";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "StevenLooman";
    repo = "async_upnp_client";
    rev = "refs/tags/${version}";
-    hash = "sha256-U1PkOu257ppSsoPQr4oYdNKkUrm1WKAPuuMy1pjLx8A=";
+    hash = "sha256-owg9oZv/smovJPoCjr9Y0TK4Ap5IMD7cNagtkYkJk1c=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "igraph";
-  version = "0.10.6";
+  version = "0.10.8";

  disabled = pythonOlder "3.7";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "igraph";
    repo = "python-igraph";
    rev = "refs/tags/${version}";
-    hash = "sha256-xdzk/gcHL/kFpZabdP7Cq4lUv0aEwpevgLJYqfb2KGY=";
+    hash = "sha256-EpWkFKN8fhKkzR2g9Uv0/LxSwi4TkraH5rjde7yR+C8=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "millheater";
-  version = "0.11.2";
+  version = "0.11.5";
  format = "setuptools";

  disabled = pythonOlder "3.10";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pymill";
    rev = "refs/tags/${version}";
-    hash = "sha256-PsNT/mZ4Dun4s9QpGRyEuVxYcM5AXaUS28UsSOowOb4=";
+    hash = "sha256-rDEzMxXsbHvxAmPx1IFC5S8jG8LO8TNuNq/ISkdPWsU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pyenphase";
-  version = "1.11.0";
+  version = "1.11.4";
  format = "pyproject";

  disabled = pythonOlder "3.11";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "pyenphase";
    repo = "pyenphase";
    rev = "refs/tags/v${version}";
-    hash = "sha256-b2rT7H9FmeM5RD1TZhXqyqgvBdTWwZHg7Hui5OpXAX8=";
+    hash = "sha256-ZFK7Pyn8YsxdxPICtDXx2L+3t/xG3x2HC+F0plDbvHk=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "pynetgear";
-  version = "0.10.9";
+  version = "0.10.10";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "MatMaul";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-VYiXFdUD4q6d7KraA26SFV29k53AoluCj7ACMgNQcLU=";
+    hash = "sha256-5Lj2cK/SOGgaPu8dI9X3Leg4dPAY7tdIHCzFnNaube8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/sensirion-ble/default.nix
+++ b/pkgs/development/python-modules/sensirion-ble/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "sensirion-ble";
-  version = "0.1.0";
+  version = "0.1.1";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "akx";
    repo = "sensirion-ble";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7l76/Bci1ztt2CfwytLOySK6IL8IDijpB0AYhksRP7o=";
+    hash = "sha256-VeUfrQ/1Hqs9yueUKcv/ZpCDEEy84VDcZpuTT4fXSGw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "yalexs";
-  version = "1.8.0";
+  version = "1.9.0";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "bdraco";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ZxZIv69HooX6SUIdrtAuhOEVPN7E+E/AZ138XmzIYIE=";
+    hash = "sha256-9rXAFMFpKF+oIKXSFLVCLDfdpMF837xRIEe3aH7ditc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/analysis/stylelint/default.nix
+++ b/pkgs/development/tools/analysis/stylelint/default.nix
@ -0,0 +1,24 @@
+{ buildNpmPackage, fetchFromGitHub, lib }:
+
+buildNpmPackage rec {
+  pname = "stylelint";
+  version = "15.10.3";
+
+  src = fetchFromGitHub {
+    owner = "stylelint";
+    repo = "stylelint";
+    rev = version;
+    hash = "sha256-k7Ngbd4Z3/JjCK6taynIiNCDTKfqGRrjfR0ePyRFY4w=";
+  };
+
+  npmDepsHash = "sha256-tVDhaDeUKzuyJU5ABSOeYgS56BDSJTfjBZdTsuL/7tA=";
+
+  dontNpmBuild = true;
+
+  meta = with lib; {
+    description = "Mighty CSS linter that helps you avoid errors and enforce conventions";
+    homepage = "https://stylelint.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
--- a/pkgs/development/tools/cotton/Cargo.lock
+++ b/pkgs/development/tools/cotton/Cargo.lock
@ -34,16 +34,15 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
 "anstyle",
 "anstyle-parse",
 "anstyle-query",
 "anstyle-wincon",
 "colorchoice",
- "is-terminal",
 "utf8parse",
 ]

@ -68,24 +67,24 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
 name = "anstyle-wincon"
-version = "1.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
 "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
 name = "async-compression"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6"
+checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c"
 dependencies = [
 "brotli",
 "flate2",
@ -97,9 +96,9 @@ dependencies = [

 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
 "proc-macro2",
 "quote",
@ -156,6 +155,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+
 [[package]]
 name = "brotli"
 version = "3.3.4"
@ -254,20 +259,19 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.3.21"
+version = "4.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
+checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6"
 dependencies = [
 "clap_builder",
 "clap_derive",
- "once_cell",
 ]

 [[package]]
 name = "clap_builder"
-version = "4.3.21"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
+checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
 dependencies = [
 "anstream",
 "anstyle",
@ -277,9 +281,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.3.12"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
 "heck",
 "proc-macro2",
@ -463,9 +467,9 @@ dependencies = [

 [[package]]
 name = "dashmap"
-version = "5.5.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
 "cfg-if",
 "hashbrown 0.14.0",
@ -522,13 +526,13 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"

 [[package]]
 name = "errno"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
 dependencies = [
 "errno-dragonfly",
 "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]

 [[package]]
@ -562,14 +566,14 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.17"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.2.13",
- "windows-sys 0.36.1",
+ "redox_syscall 0.3.5",
+ "windows-sys",
 ]

 [[package]]
@ -584,15 +588,14 @@ dependencies = [

 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
 "futures-core",
 "futures-sink",
 "nanorand",
- "pin-project",
- "spin 0.9.4",
+ "spin 0.9.8",
 ]

 [[package]]
@ -744,9 +747,9 @@ checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"

 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
 dependencies = [
 "bytes",
 "fnv",
@ -795,10 +798,13 @@ dependencies = [
 ]

 [[package]]
-name = "hermit-abi"
-version = "0.3.1"
+name = "home"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]

 [[package]]
 name = "hostname"
@ -835,9 +841,9 @@ dependencies = [

 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"

 [[package]]
 name = "httpdate"
@ -847,9 +853,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"

 [[package]]
 name = "hyper"
-version = "0.14.20"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
 "bytes",
 "futures-channel",
@ -955,7 +961,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "inotify-sys",
 "libc",
 ]
@ -978,16 +984,6 @@ dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "io-lifetimes"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87"
-dependencies = [
- "libc",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "ipconfig"
 version = "0.3.0"
@ -1006,18 +1002,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"

-[[package]]
-name = "is-terminal"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
-dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@ -1058,7 +1042,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "libc",
 ]

@ -1076,9 +1060,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"

 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e"
+checksum = "25d058a81af0d1c22d7a1c948576bee6d673f7af3c0f35564abd6c81122f513d"
 dependencies = [
 "cc",
 "libc",
@ -1092,9 +1076,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

 [[package]]
 name = "linux-raw-sys"
-version = "0.3.0"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"

 [[package]]
 name = "lock_api"
@ -1184,9 +1168,9 @@ dependencies = [

 [[package]]
 name = "mimalloc"
-version = "0.1.37"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
+checksum = "972e5f23f6716f62665760b0f4cbf592576a80c7b879ba9beaafc0e558894127"
 dependencies = [
 "libmimalloc-sys",
 ]
@ -1221,7 +1205,7 @@ dependencies = [
 "libc",
 "log",
 "wasi",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -1248,7 +1232,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "cfg-if",
 "libc",
 "memoffset",
@ -1280,20 +1264,21 @@ dependencies = [

 [[package]]
 name = "notify"
-version = "6.0.1"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
 "crossbeam-channel",
 "filetime",
 "fsevent-sys",
 "inotify",
 "kqueue",
 "libc",
+ "log",
 "mio",
 "walkdir",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]

 [[package]]
@ -1312,7 +1297,7 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi",
 "libc",
 ]

@ -1375,7 +1360,7 @@ dependencies = [
 "libc",
 "redox_syscall 0.3.5",
 "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets",
 ]

 [[package]]
@ -1384,26 +1369,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"

-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.104",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.11"
@ -1488,7 +1453,7 @@ version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]

 [[package]]
@ -1497,7 +1462,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]

 [[package]]
@ -1526,9 +1491,9 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

 [[package]]
 name = "reqwest"
-version = "0.11.18"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
 "async-compression",
 "base64 0.21.0",
@ -1564,7 +1529,7 @@ dependencies = [
 "wasm-streams",
 "web-sys",
 "webpki-roots",
- "winreg 0.10.1",
+ "winreg 0.50.0",
 ]

 [[package]]
@ -1606,23 +1571,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "0.37.4"
+version = "0.38.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9"
+checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
 "errno",
- "io-lifetimes",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]

 [[package]]
 name = "rustls"
-version = "0.21.1"
+version = "0.21.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
 dependencies = [
 "log",
 "ring",
@ -1641,9 +1605,9 @@ dependencies = [

 [[package]]
 name = "rustls-webpki"
-version = "0.100.1"
+version = "0.101.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0"
 dependencies = [
 "ring",
 "untrusted",
@ -1688,18 +1652,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.183"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.183"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1708,9 +1672,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
 dependencies = [
 "indexmap 2.0.0",
 "itoa",
@ -1799,7 +1763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
 dependencies = [
 "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -1810,9 +1774,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "spin"
-version = "0.9.4"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 dependencies = [
 "lock_api",
 ]
@ -1913,9 +1877,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.30.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
 "backtrace",
 "bytes",
@ -1927,7 +1891,7 @@ dependencies = [
 "signal-hook-registry",
 "socket2 0.5.3",
 "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -1993,9 +1957,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e"
 dependencies = [
 "serde",
 "serde_spanned",
@ -2014,9 +1978,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.19.12"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
+checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95"
 dependencies = [
 "indexmap 2.0.0",
 "serde",
@ -2188,9 +2152,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
 "form_urlencoded",
 "idna 0.4.0",
@ -2311,9 +2275,9 @@ checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"

 [[package]]
 name = "wasm-streams"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
+checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
 dependencies = [
 "futures-util",
 "js-sys",
@ -2332,34 +2296,22 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki-roots"
-version = "0.22.4"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
-dependencies = [
- "webpki",
-]
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"

 [[package]]
 name = "which"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
 "either",
- "libc",
+ "home",
 "once_cell",
+ "rustix",
 ]

 [[package]]
@ -2399,65 +2351,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
+ "windows-targets",
 ]

 [[package]]
@ -2466,123 +2366,51 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"
@ -2591,9 +2419,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

 [[package]]
 name = "winnow"
-version = "0.4.6"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
 dependencies = [
 "memchr",
 ]
@ -2609,11 +2437,12 @@ dependencies = [

 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys",
 ]

 [[package]]
--- a/pkgs/development/tools/cotton/default.nix
+++ b/pkgs/development/tools/cotton/default.nix
@ -7,13 +7,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "cotton";
-  version = "unstable-2023-08-09";
+  version = "unstable-2023-09-13";

  src = fetchFromGitHub {
    owner = "danielhuang";
    repo = pname;
-    rev = "04e2dfd123f7af6e78e3ce86b2fc04ca4c754cdc";
-    sha256 = "sha256-+HOuQyGkyS7oG0I0DkFGl+6YIDpV4GCCgC+a5Jwo4fw=";
+    rev = "df9d79a4b0bc4b140e87ddd7795924a93775a864";
+    sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE=";
  };

  cargoLock = {
--- a/pkgs/development/tools/purescript/spago/default.nix
+++ b/pkgs/development/tools/purescript/spago/default.nix
@ -17,8 +17,6 @@ let
        (haskell.lib.compose.overrideCabal (oldAttrs: {
          changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}";
        }))
-        haskell.lib.compose.unmarkBroken
-        haskell.lib.compose.doDistribute
      ];
 in

--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@ -81,7 +81,10 @@ in stdenv.mkDerivation rec {
  '';

  preFixup = ''
-    wrapProgram "$out/bin/insomnia" "''${gappsWrapperArgs[@]}" --prefix LD_LIBRARY_PATH : ${runtimeLibs}
+    wrapProgramShell "$out/bin/insomnia" \
+        "''${gappsWrapperArgs[@]}" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \
+        --prefix LD_LIBRARY_PATH : ${runtimeLibs}
  '';

  meta = with lib; {
--- a/pkgs/games/path-of-building/default.nix
+++ b/pkgs/games/path-of-building/default.nix
@ -2,13 +2,13 @@
 let
  data = stdenv.mkDerivation(finalAttrs: {
    pname = "path-of-building-data";
-    version = "2.33.5";
+    version = "2.34.0";

    src = fetchFromGitHub {
      owner = "PathOfBuildingCommunity";
      repo = "PathOfBuilding";
      rev = "v${finalAttrs.version}";
-      hash = "sha256-a7/xuVfsLQaSsmHVFKqDEypCunFQtHvcVISaQD1YCEs=";
+      hash = "sha256-A672cs930wRV8DwRpah//emtsAidNnOzwtfXiiYxyd4=";
    };

    nativeBuildInputs = [ unzip ];
--- a/pkgs/servers/haste-server/default.nix
+++ b/pkgs/servers/haste-server/default.nix
@ -1,65 +1,39 @@
 { lib
 , nixosTests
-, stdenv
+, buildNpmPackage
 , fetchFromGitHub
-, makeWrapper
-, nodejs_18
-, pkgs
 }:

-let
-  nodejs = nodejs_18;
-in
-stdenv.mkDerivation rec {
+buildNpmPackage rec {
  pname = "haste-server";
-  version = "b52b394bad909ddf151073987671e843540d91d6";
+  version = "unstable-2023-03-06";

  src = fetchFromGitHub {
    owner = "toptal";
    repo = "haste-server";
-    rev = version;
+    rev = "b52b394bad909ddf151073987671e843540d91d6";
    hash = "sha256-AVoz5MY5gNxQrHtDMPbQ85IjmHii1v6C2OXpEQj9zC8=";
  };

-  nativeBuildInputs = [
-    nodejs
-    makeWrapper
-  ];
+  npmDepsHash = "sha256-FEuqKbblAts0WTnGI9H9bRBOwPvkahltra1zl3sMPJs=";

-  installPhase =
-    let
-      nodeDependencies = ((import ./node-composition.nix {
-        inherit pkgs nodejs;
-        inherit (stdenv.hostPlatform) system;
-      }).nodeDependencies.override (old: {
-        # access to path '/nix/store/...-source' is forbidden in restricted mode
-        src = src;
-        dontNpmInstall = true;
-      }));
-    in
-    ''
-      runHook postInstall
+  dontNpmBuild = true;

-      mkdir -p $out/share
-      cp -ra . $out/share/haste-server
-      ln -s ${nodeDependencies}/lib/node_modules $out/share/haste-server/node_modules
-      makeWrapper ${nodejs}/bin/node $out/bin/haste-server \
-        --add-flags $out/share/haste-server/server.js
-
-      runHook postBuild
-    '';
+  postInstall = ''
+    install -Dt "$out/share/haste-server" about.md
+  '';

  passthru = {
    tests = {
      inherit (nixosTests) haste-server;
    };
-    updateScript = ./update.sh;
  };

  meta = with lib; {
-    description = "open source pastebin written in node.js";
-    homepage = "https://www.toptal.com/developers/hastebin/about.md";
+    description = "Open source pastebin written in Node.js";
+    homepage = "https://github.com/toptal/haste-server";
    license = licenses.mit;
+    mainProgram = "haste-server";
    maintainers = with maintainers; [ mkg20001 ];
  };
 }
--- a/pkgs/servers/haste-server/node-composition.nix
+++ b/pkgs/servers/haste-server/node-composition.nix
@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.11.1. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
-
-let
-  nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-deps.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
-  inherit nodeEnv;
-}
--- a/pkgs/servers/haste-server/node-deps.nix
+++ b/pkgs/servers/haste-server/node-deps.nix
--- a/pkgs/servers/haste-server/node-env.nix
+++ b/pkgs/servers/haste-server/node-env.nix
@ -1,686 +0,0 @@
-# This file originates from node2nix
-
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
-
-let
-  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
-  python = if nodejs ? python then nodejs.python else python2;
-
-  # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
-  tarWrapper = runCommand "tarWrapper" {} ''
-    mkdir -p $out/bin
-
-    cat > $out/bin/tar <<EOF
-    #! ${stdenv.shell} -e
-    $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
-    EOF
-
-    chmod +x $out/bin/tar
-  '';
-
-  # Function that generates a TGZ file from a NPM project
-  buildNodeSourceDist =
-    { name, version, src, ... }:
-
-    stdenv.mkDerivation {
-      name = "node-tarball-${name}-${version}";
-      inherit src;
-      buildInputs = [ nodejs ];
-      buildPhase = ''
-        export HOME=$TMPDIR
-        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
-      '';
-      installPhase = ''
-        mkdir -p $out/tarballs
-        mv $tgzFile $out/tarballs
-        mkdir -p $out/nix-support
-        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
-      '';
-    };
-
-  # Common shell logic
-  installPackage = writeShellScript "install-package" ''
-    installPackage() {
-      local packageName=$1 src=$2
-
-      local strippedName
-
-      local DIR=$PWD
-      cd $TMPDIR
-
-      unpackFile $src
-
-      # Make the base dir in which the target dependency resides first
-      mkdir -p "$(dirname "$DIR/$packageName")"
-
-      if [ -f "$src" ]
-      then
-          # Figure out what directory has been unpacked
-          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
-
-          # Restore write permissions to make building work
-          find "$packageDir" -type d -exec chmod u+x {} \;
-          chmod -R u+w "$packageDir"
-
-          # Move the extracted tarball into the output folder
-          mv "$packageDir" "$DIR/$packageName"
-      elif [ -d "$src" ]
-      then
-          # Get a stripped name (without hash) of the source directory.
-          # On old nixpkgs it's already set internally.
-          if [ -z "$strippedName" ]
-          then
-              strippedName="$(stripHash $src)"
-          fi
-
-          # Restore write permissions to make building work
-          chmod -R u+w "$strippedName"
-
-          # Move the extracted directory into the output folder
-          mv "$strippedName" "$DIR/$packageName"
-      fi
-
-      # Change to the package directory to install dependencies
-      cd "$DIR/$packageName"
-    }
-  '';
-
-  # Bundle the dependencies of the package
-  #
-  # Only include dependencies if they don't exist. They may also be bundled in the package.
-  includeDependencies = {dependencies}:
-    lib.optionalString (dependencies != []) (
-      ''
-        mkdir -p node_modules
-        cd node_modules
-      ''
-      + (lib.concatMapStrings (dependency:
-        ''
-          if [ ! -e "${dependency.packageName}" ]; then
-              ${composePackage dependency}
-          fi
-        ''
-      ) dependencies)
-      + ''
-        cd ..
-      ''
-    );
-
-  # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    builtins.addErrorContext "while evaluating node package '${packageName}'" ''
-      installPackage "${packageName}" "${src}"
-      ${includeDependencies { inherit dependencies; }}
-      cd ..
-      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-    '';
-
-  pinpointDependencies = {dependencies, production}:
-    let
-      pinpointDependenciesFromPackageJSON = writeTextFile {
-        name = "pinpointDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var path = require('path');
-
-          function resolveDependencyVersion(location, name) {
-              if(location == process.env['NIX_STORE']) {
-                  return null;
-              } else {
-                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
-                  if(fs.existsSync(dependencyPackageJSON)) {
-                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
-                      if(dependencyPackageObj.name == name) {
-                          return dependencyPackageObj.version;
-                      }
-                  } else {
-                      return resolveDependencyVersion(path.resolve(location, ".."), name);
-                  }
-              }
-          }
-
-          function replaceDependencies(dependencies) {
-              if(typeof dependencies == "object" && dependencies !== null) {
-                  for(var dependency in dependencies) {
-                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
-                      if(resolvedVersion === null) {
-                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
-                      } else {
-                          dependencies[dependency] = resolvedVersion;
-                      }
-                  }
-              }
-          }
-
-          /* Read the package.json configuration */
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Pinpoint all dependencies */
-          replaceDependencies(packageObj.dependencies);
-          if(process.argv[2] == "development") {
-              replaceDependencies(packageObj.devDependencies);
-          }
-          else {
-              packageObj.devDependencies = {};
-          }
-          replaceDependencies(packageObj.optionalDependencies);
-          replaceDependencies(packageObj.peerDependencies);
-
-          /* Write the fixed package.json file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
-        '';
-      };
-    in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
-      ${lib.optionalString (dependencies != [])
-        ''
-          if [ -d node_modules ]
-          then
-              cd node_modules
-              ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
-              cd ..
-          fi
-        ''}
-    '';
-
-  # Recursively traverses all dependencies of a package and pinpoints all
-  # dependencies in the package.json file to the versions that are actually
-  # being used.
-
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
-    ''
-      if [ -d "${packageName}" ]
-      then
-          cd "${packageName}"
-          ${pinpointDependencies { inherit dependencies production; }}
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-      fi
-    '';
-
-  # Extract the Node.js source code which is used to compile packages with
-  # native bindings
-  nodeSources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv node-* $out
-  '';
-
-  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
-  addIntegrityFieldsScript = writeTextFile {
-    name = "addintegrityfields.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      function augmentDependencies(baseDir, dependencies) {
-          for(var dependencyName in dependencies) {
-              var dependency = dependencies[dependencyName];
-
-              // Open package.json and augment metadata fields
-              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
-              var packageJSONPath = path.join(packageJSONDir, "package.json");
-
-              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
-                  console.log("Adding metadata fields to: "+packageJSONPath);
-                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
-
-                  if(dependency.integrity) {
-                      packageObj["_integrity"] = dependency.integrity;
-                  } else {
-                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
-                  }
-
-                  if(dependency.resolved) {
-                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
-                  } else {
-                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
-                  }
-
-                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
-                      packageObj["_from"] = dependency.from;
-                  }
-
-                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
-              }
-
-              // Augment transitive dependencies
-              if(dependency.dependencies !== undefined) {
-                  augmentDependencies(packageJSONDir, dependency.dependencies);
-              }
-          }
-      }
-
-      if(fs.existsSync("./package-lock.json")) {
-          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
-
-          if(![1, 2].includes(packageLock.lockfileVersion)) {
-            process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
-            process.exit(1);
-          }
-
-          if(packageLock.dependencies !== undefined) {
-              augmentDependencies(".", packageLock.dependencies);
-          }
-      }
-    '';
-  };
-
-  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
-  reconstructPackageLock = writeTextFile {
-    name = "reconstructpackagelock.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
-      var lockObj = {
-          name: packageObj.name,
-          version: packageObj.version,
-          lockfileVersion: 2,
-          requires: true,
-          packages: {
-              "": {
-                  name: packageObj.name,
-                  version: packageObj.version,
-                  license: packageObj.license,
-                  bin: packageObj.bin,
-                  dependencies: packageObj.dependencies,
-                  engines: packageObj.engines,
-                  optionalDependencies: packageObj.optionalDependencies
-              }
-          },
-          dependencies: {}
-      };
-
-      function augmentPackageJSON(filePath, packages, dependencies) {
-          var packageJSON = path.join(filePath, "package.json");
-          if(fs.existsSync(packageJSON)) {
-              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
-              packages[filePath] = {
-                  version: packageObj.version,
-                  integrity: "sha1-000000000000000000000000000=",
-                  dependencies: packageObj.dependencies,
-                  engines: packageObj.engines,
-                  optionalDependencies: packageObj.optionalDependencies
-              };
-              dependencies[packageObj.name] = {
-                  version: packageObj.version,
-                  integrity: "sha1-000000000000000000000000000=",
-                  dependencies: {}
-              };
-              processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
-          }
-      }
-
-      function processDependencies(dir, packages, dependencies) {
-          if(fs.existsSync(dir)) {
-              var files = fs.readdirSync(dir);
-
-              files.forEach(function(entry) {
-                  var filePath = path.join(dir, entry);
-                  var stats = fs.statSync(filePath);
-
-                  if(stats.isDirectory()) {
-                      if(entry.substr(0, 1) == "@") {
-                          // When we encounter a namespace folder, augment all packages belonging to the scope
-                          var pkgFiles = fs.readdirSync(filePath);
-
-                          pkgFiles.forEach(function(entry) {
-                              if(stats.isDirectory()) {
-                                  var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, packages, dependencies);
-                              }
-                          });
-                      } else {
-                          augmentPackageJSON(filePath, packages, dependencies);
-                      }
-                  }
-              });
-          }
-      }
-
-      processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
-
-      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
-    '';
-  };
-
-  # Script that links bins defined in package.json to the node_modules bin directory
-  # NPM does not do this for top-level packages itself anymore as of v7
-  linkBinsScript = writeTextFile {
-    name = "linkbins.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
-      var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
-
-      if(packageObj.bin !== undefined) {
-          fs.mkdirSync(path.join(nodeModules, ".bin"))
-
-          if(typeof packageObj.bin == "object") {
-              Object.keys(packageObj.bin).forEach(function(exe) {
-                  if(fs.existsSync(packageObj.bin[exe])) {
-                      console.log("linking bin '" + exe + "'");
-                      fs.symlinkSync(
-                          path.join("..", packageObj.name, packageObj.bin[exe]),
-                          path.join(nodeModules, ".bin", exe)
-                      );
-                  }
-                  else {
-                      console.log("skipping non-existent bin '" + exe + "'");
-                  }
-              })
-          }
-          else {
-              if(fs.existsSync(packageObj.bin)) {
-                  console.log("linking bin '" + packageObj.bin + "'");
-                  fs.symlinkSync(
-                      path.join("..", packageObj.name, packageObj.bin),
-                      path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
-                  );
-              }
-              else {
-                  console.log("skipping non-existent bin '" + packageObj.bin + "'");
-              }
-          }
-      }
-      else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
-          fs.mkdirSync(path.join(nodeModules, ".bin"))
-
-          fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
-              if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
-                  console.log("linking bin '" + exe + "'");
-                  fs.symlinkSync(
-                      path.join("..", packageObj.name, packageObj.directories.bin, exe),
-                      path.join(nodeModules, ".bin", exe)
-                  );
-              }
-              else {
-                  console.log("skipping non-existent bin '" + exe + "'");
-              }
-          })
-      }
-    '';
-  };
-
-  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
-    let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
-    in
-    ''
-        # Pinpoint the versions of all dependencies to the ones that are actually being used
-        echo "pinpointing versions of dependencies..."
-        source $pinpointDependenciesScriptPath
-
-        # Patch the shebangs of the bundled modules to prevent them from
-        # calling executables outside the Nix store as much as possible
-        patchShebangs .
-
-        # Deploy the Node.js package by running npm install. Since the
-        # dependencies have been provided already by ourselves, it should not
-        # attempt to install them again, which is good, because we want to make
-        # it Nix's responsibility. If it needs to install any dependencies
-        # anyway (e.g. because the dependency parameters are
-        # incomplete/incorrect), it fails.
-        #
-        # The other responsibilities of NPM are kept -- version checks, build
-        # steps, postprocessing etc.
-
-        export HOME=$TMPDIR
-        cd "${packageName}"
-        runHook preRebuild
-
-        ${lib.optionalString bypassCache ''
-          ${lib.optionalString reconstructLock ''
-            if [ -f package-lock.json ]
-            then
-                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
-                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
-                rm package-lock.json
-            else
-                echo "No package-lock.json file found, reconstructing..."
-            fi
-
-            node ${reconstructPackageLock}
-          ''}
-
-          node ${addIntegrityFieldsScript}
-        ''}
-
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
-
-        runHook postRebuild
-
-        if [ "''${dontNpmInstall-}" != "1" ]
-        then
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
-        fi
-
-        # Link executables defined in package.json
-        node ${linkBinsScript}
-    '';
-
-  # Builds and composes an NPM package including all its dependencies
-  buildNodePackage =
-    { name
-    , packageName
-    , version ? null
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , preRebuild ? ""
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , meta ? {}
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
-    in
-    stdenv.mkDerivation ({
-      name = "${name}${if version == null then "" else "-${version}"}";
-      buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) utillinux
-        ++ lib.optional (stdenv.isDarwin) libtool
-        ++ buildInputs;
-
-      inherit nodejs;
-
-      inherit dontStrip; # Stripping may fail a build for some package deployments
-      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
-
-      compositionScript = composePackage args;
-      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
-
-      installPhase = ''
-        source ${installPackage}
-
-        # Create and enter a root node_modules/ folder
-        mkdir -p $out/lib/node_modules
-        cd $out/lib/node_modules
-
-        # Compose the package and all its dependencies
-        source $compositionScriptPath
-
-        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-        # Create symlink to the deployed executable folder, if applicable
-        if [ -d "$out/lib/node_modules/.bin" ]
-        then
-            ln -s $out/lib/node_modules/.bin $out/bin
-
-            # Patch the shebang lines of all the executables
-            ls $out/bin/* | while read i
-            do
-                file="$(readlink -f "$i")"
-                chmod u+rwx "$file"
-                patchShebangs "$file"
-            done
-        fi
-
-        # Create symlinks to the deployed manual page folders, if applicable
-        if [ -d "$out/lib/node_modules/${packageName}/man" ]
-        then
-            mkdir -p $out/share
-            for dir in "$out/lib/node_modules/${packageName}/man/"*
-            do
-                mkdir -p $out/share/man/$(basename "$dir")
-                for page in "$dir"/*
-                do
-                    ln -s $page $out/share/man/$(basename "$dir")
-                done
-            done
-        fi
-
-        # Run post install hook, if provided
-        runHook postInstall
-      '';
-
-      meta = {
-        # default to Node.js' platforms
-        platforms = nodejs.meta.platforms;
-      } // meta;
-    } // extraArgs);
-
-  # Builds a node environment (a node_modules folder and a set of binaries)
-  buildNodeDependencies =
-    { name
-    , packageName
-    , version ? null
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-    in
-      stdenv.mkDerivation ({
-        name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ lib.optional (stdenv.isLinux) utillinux
-          ++ lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          source ${installPackage}
-
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-                chmod 644 package-lock.json
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-
-  # Builds a development shell
-  buildNodeShell =
-    { name
-    , packageName
-    , version ? null
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      nodeDependencies = buildNodeDependencies args;
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
-    in
-    stdenv.mkDerivation ({
-      name = "node-shell-${name}${if version == null then "" else "-${version}"}";
-
-      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-      buildCommand = ''
-        mkdir -p $out/bin
-        cat > $out/bin/shell <<EOF
-        #! ${stdenv.shell} -e
-        $shellHook
-        exec ${stdenv.shell}
-        EOF
-        chmod +x $out/bin/shell
-      '';
-
-      # Provide the dependencies in a development shell through the NODE_PATH environment variable
-      inherit nodeDependencies;
-      shellHook = lib.optionalString (dependencies != []) ''
-        export NODE_PATH=${nodeDependencies}/lib/node_modules
-        export PATH="${nodeDependencies}/bin:$PATH"
-      '';
-    } // extraArgs);
-in
-{
-  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = lib.makeOverridable buildNodePackage;
-  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
-  buildNodeShell = lib.makeOverridable buildNodeShell;
-}
--- a/pkgs/servers/haste-server/update.sh
+++ b/pkgs/servers/haste-server/update.sh
@ -1,28 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq
-
-set -euo pipefail
-
-latestVersion="$(curl -s "https://api.github.com/repos/toptal/haste-server/commits?per_page=1" | jq -r ".[0].sha")"
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; haste-server.version or (lib.getVersion haste-server)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-  echo "haste-server is up-to-date: $currentVersion"
-  exit 0
-fi
-
-update-source-version haste-server 0 sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
-update-source-version haste-server "$latestVersion"
-
-# use patched source
-store_src="$(nix-build . -A haste-server.src --no-out-link)"
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-node2nix \
-  --nodejs-14 \
-  --development \
-  --node-env ./node-env.nix \
-  --output ./node-deps.nix \
-  --input "$store_src/package.json" \
-  --composition ./node-composition.nix
--- a/pkgs/servers/nosql/surrealdb/default.nix
+++ b/pkgs/servers/nosql/surrealdb/default.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "surrealdb";
-  version = "1.0.0-beta.11";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "surrealdb";
    repo = "surrealdb";
    rev = "v${version}";
-    hash = "sha256-y2oZ9zqWkc//Dc6eIvDiEjG8FZf1hMS+dDOVaFDT3Jk=";
+    hash = "sha256-rBqg8tMcdc9VavYQDiKQwNp2IxYvpDNB/Qb74uiMmO4=";
  };

-  cargoHash = "sha256-rPROcDjQTxwB+Pcv2quE9z1FK5irPRDdmfviY0GoTx4=";
+  cargoHash = "sha256-qbKc9/n4bOvdP2iXg6IF3jAwxx6Wj17Uxlj3F/gx+1g=";

  # error: linker `aarch64-linux-gnu-gcc` not found
  postPatch = ''
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@ -1,16 +1,16 @@
 { lib, stdenv, fetchurl, jre, unzip, runtimeShell }:

-let
-  major = "15";
-  minor = "0";
-  patch = "0";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "umlet";
-  version = "${major}.${minor}.${patch}";
+  version = "15.1.0";

  src = fetchurl {
-    url = "https://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
-    sha256 = "sha256-gdvhqYGyrFuQhhrkF26wXb3TQLRCLm59/uSxTPmHdAE=";
+    # NOTE: The download URL breaks consistency - sometimes w/ patch versions
+    # and sometimes w/o. Furthermore, for 15.1.0 they moved everything to the
+    # new /download subfolder.
+    # As releases are very rarely, just modify it by hand..
+    url = "https://www.umlet.com/download/umlet_15_1/umlet-standalone-15.1.zip";
+    hash = "sha256-M6oVWbOmPBTygS+TFkY9PWucFfYLD33suNUuWpFLMIo=";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/tools/misc/vsc-leetcode-cli/default.nix
+++ b/pkgs/tools/misc/vsc-leetcode-cli/default.nix
@ -0,0 +1,28 @@
+{ buildNpmPackage
+, fetchFromGitHub
+, lib
+}:
+
+buildNpmPackage {
+  pname = "vsc-leetcode-cli";
+  version = "unstable-2021-04-11";
+
+  src = fetchFromGitHub {
+    owner = "leetcode-tools";
+    repo = "leetcode-cli";
+    rev = "c5f6b8987185ae9f181e138f999825516240f44c";
+    hash = "sha256-N8hQqIzCUYTT5RAd0eqNynSNkGiN4omFY+8QLBemIbs=";
+  };
+
+  npmDepsHash = "sha256-t8eEnyAKeDmbmduUXuxo/WbJTced5dLeJTbtjxrrxY8=";
+
+  dontNpmBuild = true;
+
+  meta = with lib; {
+    description = "A CLI tool for leetcode.com";
+    homepage = "https://github.com/leetcode-tools/leetcode-cli";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cpcloud ];
+    mainProgram = "leetcode";
+  };
+}
--- a/pkgs/tools/nix/gridlock/default.nix
+++ b/pkgs/tools/nix/gridlock/default.nix
@ -9,18 +9,18 @@

 rustPlatform.buildRustPackage {
  pname = "gridlock";
-  version = "unstable-2023-03-03";
+  version = "unstable-2023-08-29";

  outputs = [ "out" "nyarr" ];

  src = fetchFromGitHub {
    owner = "lf-";
    repo = "gridlock";
-    rev = "15261abdb179e1d7e752772bf9db132b3ee343ea";
-    hash = "sha256-rnPAEJH3TebBH6lqgVo7B+nNiArDIkGDnIZWcteFNEw=";
+    rev = "a98abfa554e5f8e2b7242662c0c714b7f1d7ec29";
+    hash = "sha256-I4NGfgNX79ZhWXDeUDJyDzP2GxcNhHhazVmmmPlz5js=";
  };

-  cargoHash = "sha256-EPs5vJ2RkVXKxrTRtbT/1FbvCT0KJtNuW2WKIUq7G0U=";
+  cargoHash = "sha256-qz77c2IZGaWsinfkVTWqfEeBEtHng6W738jBwJAkrl4=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/tools/security/echidna/default.nix
+++ b/pkgs/tools/security/echidna/default.nix
@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
+, fetchpatch
 , haskellPackages
 , haskell
 , slither-analyzer
@ -34,6 +35,15 @@ in mkDerivation rec {
    sha256 = "sha256-5d9ttPR3rRHywBeLM85EGCEZLNZNZzOAhIN6AJToJyI=";
  };

+  # Note: pending PR https://github.com/crytic/echidna/pull/1096
+  patches = [
+     (fetchpatch {
+       name = "brick-1.9-update";
+       url = "https://github.com/crytic/echidna/pull/1096/commits/36657d54943727e569691a6b3d85b83130480a2e.patch";
+       sha256 = "sha256-AOmB/fAZCF7ruXW1HusRe7wWWsLyMCWw+j3qIPARIAc=";
+     })
+  ];
+
  isLibrary = true;
  isExecutable = true;

--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2023-09-12";
+  version = "2023-09-13";

  src = fetchFromGitLab {
    owner = "exploit-database";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-XMOXBlCld1YXymRMOMIeQgszn8L6rMCZWPHlLtIAlRg=";
+    hash = "sha256-Dv7LcKzZi5uvEiYmFk/lrOd1l1VknCvjz7cV3K2UfeM=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/steamguard-cli/default.nix
+++ b/pkgs/tools/security/steamguard-cli/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "steamguard-cli";
-  version = "0.12.0";
+  version = "0.12.1";

  src = fetchFromGitHub {
    owner = "dyc3";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-WCEMZTi9/EI8JaUM5w2xJkx0x3DoaByORgVqw1TPcgI=";
+    hash = "sha256-i+q8hiElLuA1oHRLASiO/icEmhd1VqvV/zKGV0CSXms=";
  };

-  cargoHash = "sha256-FVjL0tFndJNsL5oZSSqBvMtCEPqzf5xZGd8NaV5nmr4=";
+  cargoHash = "sha256-1K482GygV9SLpbpwF1iI3pwL0gcNo0eM2goKTgscK64=";

  meta = with lib; {
    changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}";
--- a/pkgs/tools/typesetting/typst/Cargo.lock
+++ b/pkgs/tools/typesetting/typst/Cargo.lock
--- a/pkgs/tools/typesetting/typst/default.nix
+++ b/pkgs/tools/typesetting/typst/default.nix
@ -8,19 +8,21 @@

 rustPlatform.buildRustPackage rec {
  pname = "typst";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "typst";
    repo = "typst";
    rev = "v${version}";
-    hash = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
+    hash = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
+      "oxipng-8.0.0" = "sha256-KIbSsQEjwJ12DxYpBTUD1g9CqJqCfSAmnFcSTiGIoio=";
+      "self-replace-1.3.5" = "sha256-N57nmLHgxhVR1CDtkgjYwpo1ypdGyVpjJY7vzuncxDc=";
    };
  };

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2674,8 +2674,11 @@ with pkgs;

  mainsail = callPackage ../applications/misc/mainsail { };

-  # Does not build with default Haskell version because upstream uses a newer Cabal version.
-  mailctl = haskell.packages.ghc94.callPackage ../tools/networking/mailctl { };
+  mailctl = (haskellPackages.callPackage ../tools/networking/mailctl {}).overrideScope (final: prev: {
+    # Dependency twain requires an older version of http2, and we cannot mix
+    # versions of transitive dependencies.
+    http2 = final.http2_3_0_3;
+  });

  mame = libsForQt5.callPackage ../applications/emulators/mame { };

@ -13112,6 +13115,8 @@ with pkgs;

  shelldap = callPackage ../tools/misc/shelldap { };

+  shellify = haskellPackages.shellify.bin;
+
  shellspec = callPackage ../tools/misc/shellspec { };

  schema2ldif = callPackage ../tools/text/schema2ldif { };
@ -20372,6 +20377,8 @@ with pkgs;

  strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };

+  stylelint = callPackage ../development/tools/analysis/stylelint { };
+
  stylua = callPackage ../development/tools/stylua { };

  summon = callPackage ../development/tools/summon { };
@ -30766,7 +30773,9 @@ with pkgs;

  ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { };

-  schismtracker = callPackage ../applications/audio/schismtracker { };
+  schismtracker = callPackage ../applications/audio/schismtracker {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };

  jnetmap = callPackage ../applications/networking/jnetmap { };

@ -41572,6 +41581,8 @@ with pkgs;
    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly;
  };

+  vsc-leetcode-cli = callPackage ../tools/misc/vsc-leetcode-cli { };
+
  vsh = callPackage ../tools/misc/vsh { };

  vttest = callPackage ../tools/misc/vttest { };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -316,6 +316,7 @@ let
        lambdabot
        lhs2tex
        madlang
+        mailctl
        matterhorn
        mueval
        naproche