Merge master into staging-next

2024-11-28 01:43:15 +00:00 · 2023-06-28 18:01:12 +00:00 · 2023-06-28 18:01:12 +00:00 · 946b824dbb
commit 946b824dbb
parent 5f3b947258 773ac7c453
85 changed files with 2966 additions and 1372 deletions
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@ -23,7 +23,7 @@ installing and using them.

 All of these packages are originally defined in the `haskellPackages` package
 set and are re-exposed with a reduced dependency closure for convenience.
-(see `justStaticExecutables` below)
+(see `justStaticExecutables` or `separateBinOutput` below)

 The `haskellPackages` set includes at least one version of every package from
 Hackage as well as some manually injected packages. This amounts to a lot of
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -2524,7 +2524,7 @@
  };
  cafkafk = {
    email = "christina@cafkafk.com";
-    matrix = "@cafkafk:matrix.cafkafk.com";
+    matrix = "@cafkafk:m.cafkafk.com";
    name = "Christina Sørensen";
    github = "cafkafk";
    githubId = 89321978;
@ -13189,6 +13189,12 @@
    githubId = 406946;
    name = "Valentin Lorentz";
  };
+  proofconstruction = {
+    email = "source@proof.construction";
+    github = "proofconstruction";
+    githubId = 74747193;
+    name = "Alexander Groleau";
+  };
  proofofkeags = {
    email = "keagan.mcclelland@gmail.com";
    github = "ProofOfKeags";
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -56,6 +56,8 @@

 - `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details.

+- The following packages in `haskellPackages` have now a separate bin output: `cabal-fmt`, `calligraphy`, `eventlog2html`, `ghc-debug-brick`, `hindent`, `nixfmt`, `releaser`. This means you need to replace e.g. `"${pkgs.haskellPackages.nixfmt}/bin/nixfmt"` with `"${lib.getBin pkgs.haskellPackages.nixfmt}/bin/nixfmt"` or `"${lib.getExe pkgs.haskellPackages.nixfmt}"`. The binaries also won’t be in scope if you rely on them being installed e.g. via `ghcWithPackages`. `environment.packages` picks the `bin` output automatically, so for normal installation no intervention is required. Also, toplevel attributes like `pkgs.nixfmt` are not impacted negatively by this change.
+
 - `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.

 ## Other Notable Changes {#sec-release-23.11-notable-changes}
@ -78,6 +80,8 @@

 - `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.

+- The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details.
+
 ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

 - The `qemu-vm.nix` module by default now identifies block devices via
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@ -8,7 +8,7 @@ let

  x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
    mkdir -p "$out/share/X11/fonts"
-    font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+    font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
    find ${toString config.fonts.fonts} -regex "$font_regexp" \
      -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
    cd "$out/share/X11/fonts"
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@ -6,6 +6,17 @@ let

  cfg = config.services.calibre-server;

+  documentationLink = "https://manual.calibre-ebook.com";
+  generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html";
+
+  execFlags = (concatStringsSep " "
+    (mapAttrsToList (k: v: "${k} ${toString v}") (filterAttrs (name: value: value != null) {
+      "--listen-on" = cfg.host;
+      "--port" = cfg.port;
+      "--auth-mode" = cfg.auth.mode;
+      "--userdb" = cfg.auth.userDb;
+    }) ++ [(optionalString (cfg.auth.enable == true) "--enable-auth")])
+  );
 in

 {
@ -18,52 +29,100 @@ in
    )
  ];

-  ###### interface
-
  options = {
    services.calibre-server = {

      enable = mkEnableOption (lib.mdDoc "calibre-server");
+      package = lib.mkPackageOptionMD pkgs "calibre" { };

      libraries = mkOption {
-        description = lib.mdDoc ''
-          The directories of the libraries to serve. They must be readable for the user under which the server runs.
-        '';
        type = types.listOf types.path;
+        default = [ "/var/lib/calibre-server" ];
+        description = lib.mdDoc ''
+          Make sure each library path is initialized before service startup.
+          The directories of the libraries to serve. They must be readable for the user under which the server runs.
+          See the [calibredb documentation](${documentationLink}/generated/en/calibredb.html#add) for details.
+        '';
      };

      user = mkOption {
-        description = lib.mdDoc "The user under which calibre-server runs.";
        type = types.str;
        default = "calibre-server";
+        description = lib.mdDoc "The user under which calibre-server runs.";
      };

      group = mkOption {
-        description = lib.mdDoc "The group under which calibre-server runs.";
        type = types.str;
        default = "calibre-server";
+        description = lib.mdDoc "The group under which calibre-server runs.";
      };

+      host = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        example = "::1";
+        description = lib.mdDoc ''
+          The interface on which to listen for connections.
+          See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-listen-on) for details.
+        '';
+      };
+
+      port = mkOption {
+        default = 8080;
+        type = types.port;
+        description = lib.mdDoc ''
+          The port on which to listen for connections.
+          See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-port) for details.
+        '';
+      };
+
+      auth = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = lib.mdDoc ''
+            Password based authentication to access the server.
+            See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-enable-auth) for details.
+          '';
+        };
+
+        mode = mkOption {
+          type = types.enum [ "auto" "basic" "digest" ];
+          default = "auto";
+          description = lib.mdDoc ''
+            Choose the type of authentication used.
+            Set the HTTP authentication mode used by the server.
+            See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-auth-mode) for details.
+          '';
+        };
+
+        userDb = mkOption {
+          default = null;
+          type = types.nullOr types.path;
+          description = lib.mdDoc ''
+            Choose users database file to use for authentication.
+            Make sure users database file is initialized before service startup.
+            See the [calibre-server documentation](${documentationLink}/server.html#managing-user-accounts-from-the-command-line-only) for details.
+          '';
+        };
+      };
    };
  };

-
-  ###### implementation
-
  config = mkIf cfg.enable {

    systemd.services.calibre-server = {
-        description = "Calibre Server";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          User = cfg.user;
-          Restart = "always";
-          ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}";
-        };
-
+      description = "Calibre Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = cfg.user;
+        Restart = "always";
+        ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}";
      };

+    };
+
    environment.systemPackages = [ pkgs.calibre ];

    users.users = optionalAttrs (cfg.user == "calibre-server") {
@ -83,4 +142,5 @@ in

  };

+  meta.maintainers = with lib.maintainers; [ gaelreyrol ];
 }
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@ -86,8 +86,7 @@ let
    SupplementaryGroups = optional enableRedis redisServer.user;
    SystemCallArchitectures = "native";
    SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ];
-    # Does not work well with the temporary root
-    #UMask = "0066";
+    UMask = "0066";
  };
 in
 {
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@ -1126,7 +1126,7 @@ in
                It will notify, via the UI, when a new version is available.
                The check itself will not prompt any auto-updates of the Grafana software, nor will it send any sensitive information.
              '';
-              default = true;
+              default = false;
              type = types.bool;
            };

--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -151,6 +151,7 @@ in {
  cage = handleTest ./cage.nix {};
  cagebreak = handleTest ./cagebreak.nix {};
  calibre-web = handleTest ./calibre-web.nix {};
+  calibre-server = handleTest ./calibre-server.nix {};
  cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
  cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
  cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
--- a/nixos/tests/calibre-server.nix
+++ b/nixos/tests/calibre-server.nix
@ -0,0 +1,104 @@
+{ system ? builtins.currentSystem
+, config ? { }
+, pkgs ? import ../.. { inherit system config; }
+}:
+
+let
+  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
+  inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge
+    removeSuffix splitString;
+
+  tests = {
+    default = {
+      calibreConfig = {};
+      calibreScript = ''
+        wait_for_unit("calibre-server.service")
+      '';
+    };
+    customLibrary = {
+      calibreConfig = {
+        libraries = [ "/var/lib/calibre-data" ];
+      };
+      calibreScript = ''
+        succeed("ls -la /var/lib/calibre-data")
+        wait_for_unit("calibre-server.service")
+      '';
+    };
+    multipleLibraries = {
+      calibreConfig = {
+        libraries = [ "/var/lib/calibre-data" "/var/lib/calibre-server" ];
+      };
+      calibreScript = ''
+        succeed("ls -la /var/lib/calibre-data")
+        succeed("ls -la /var/lib/calibre-server")
+        wait_for_unit("calibre-server.service")
+      '';
+    };
+    hostAndPort = {
+      calibreConfig = {
+        host = "127.0.0.1";
+        port = 8888;
+      };
+      calibreScript = ''
+        wait_for_unit("calibre-server.service")
+        wait_for_open_port(8888)
+        succeed("curl --fail http://127.0.0.1:8888")
+      '';
+    };
+    basicAuth = {
+      calibreConfig = {
+        host = "127.0.0.1";
+        port = 8888;
+        auth = {
+          enable = true;
+          mode = "basic";
+        };
+      };
+      calibreScript = ''
+        wait_for_unit("calibre-server.service")
+        wait_for_open_port(8888)
+        fail("curl --fail http://127.0.0.1:8888")
+      '';
+    };
+  };
+in
+mapAttrs
+  (test: testConfig: (makeTest (
+    let
+      nodeName = testConfig.nodeName or test;
+      calibreConfig = {
+        enable = true;
+        libraries = [ "/var/lib/calibre-server" ];
+      } // testConfig.calibreConfig or {};
+      librariesInitScript = path: ''
+        ${nodeName}.execute("touch /tmp/test.epub")
+        ${nodeName}.execute("zip -r /tmp/test.zip /tmp/test.epub")
+        ${nodeName}.execute("mkdir -p ${path}")
+        ${nodeName}.execute("calibredb add -d --with-library ${path} /tmp/test.zip")
+      '';
+    in
+    {
+      name = "calibre-server-${test}";
+
+      nodes.${nodeName} = mkMerge [{
+        environment.systemPackages = [ pkgs.zip ];
+        services.calibre-server = calibreConfig;
+      } testConfig.calibreProvider or { }];
+
+      testScript = ''
+        ${nodeName}.start()
+        ${concatStringsSep "\n" (map librariesInitScript calibreConfig.libraries)}
+        ${concatStringsSep "\n" (map (line:
+          if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")")
+          then line
+          else "${nodeName}.${line}"
+        ) (splitString "\n" (removeSuffix "\n" testConfig.calibreScript)))}
+        ${nodeName}.shutdown()
+      '';
+
+      meta = with maintainers; {
+        maintainers = [ gaelreyrol ];
+      };
+    }
+  )))
+  tests
--- a/pkgs/applications/audio/waylyrics/default.nix
+++ b/pkgs/applications/audio/waylyrics/default.nix
@ -0,0 +1,59 @@
+{ lib, fetchFromGitHub, rustPlatform, gtk4, pkg-config, openssl, dbus, wrapGAppsHook4, glib, makeDesktopItem, copyDesktopItems }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "waylyrics";
+  version = "unstable-2023-05-14";
+
+  src = fetchFromGitHub {
+    owner = "poly000";
+    repo = pname;
+    rev = "7e8bd99e1748a5448c1a5c49f0664bd96fbf965e";
+    hash = "sha256-vSYtLsLvRHCCHxomPSHifXFZKjkFrlskNp7IlFflrUU=";
+  };
+
+  cargoHash = "sha256-dpJa0T6xapCBPM5fWbSDEhBlZ55c3Sr5oTnu58B/voM=";
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook4 copyDesktopItems ];
+  buildInputs = [ gtk4 openssl dbus glib ];
+
+  RUSTC_BOOTSTRAP = 1;
+
+  doCheck = false; # No tests defined in the project.
+
+  WAYLYRICS_DEFAULT_CONFIG = "${placeholder "out"}/share/waylyrics/config.toml";
+  WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes";
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "io.poly000.waylyrics";
+      exec = "waylyrics";
+      comment = "Simple on screen lyrics for MPRIS-friendly players";
+      type = "Application";
+      icon = "io.poly000.waylyrics";
+      desktopName = "Waylyrics";
+      terminal = false;
+      categories = [ "Audio" "AudioVideo" ];
+    })
+  ];
+
+  postInstall = ''
+    $out/bin/gen_config_example
+    mkdir -p $out/share/waylyrics
+    install -Dm644 config.toml $WAYLYRICS_DEFAULT_CONFIG
+    cp -vr themes $out/share/waylyrics/
+    rm $out/bin/gen_config_example # Unnecessary for end users
+    # Install schema
+    install -Dm644 io.poly000.waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas
+    glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/
+    # Install icons
+    cp -vr res/icons $out/share/
+  '';
+
+  meta = with lib; {
+    description = "On screen lyrics for Wayland with NetEase Music source";
+    homepage = "https://github.com/poly000/waylyrics";
+    license = licenses.mit;
+    maintainers = [ maintainers.shadowrz ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/blockchains/bisq-desktop/default.nix
+++ b/pkgs/applications/blockchains/bisq-desktop/default.nix
@ -16,7 +16,7 @@
 }:

 let
-  bisq-launcher = writeScript "bisq-launcher" ''
+  bisq-launcher = args: writeScript "bisq-launcher" ''
    #! ${bash}/bin/bash

    # This is just a comment to convince Nix that Tor is a
@ -24,7 +24,7 @@ let
    # whereas Nix only scans for hashes in uncompressed text.
    # ${bisq-tor}

-    JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication" bisq-desktop-wrapped "$@"
+    JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ${args}" bisq-desktop-wrapped "$@"
  '';

  bisq-tor = writeScript "bisq-tor" ''
@ -35,11 +35,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "bisq-desktop";
-  version = "1.9.9";
+  version = "1.9.10";

  src = fetchurl {
    url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
-    sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd";
+    sha256 = "1p6hwamc3vzhfg4dgrmh0vf8cxi9s46a14pjnjdyg9zgn4dyr1nm";
  };

  nativeBuildInputs = [
@ -61,6 +61,15 @@ stdenv.mkDerivation rec {
      genericName = "Decentralized bitcoin exchange";
      categories = [ "Network" "P2P" ];
    })
+
+    (makeDesktopItem {
+      name = "Bisq-hidpi";
+      exec = "bisq-desktop-hidpi";
+      icon = "bisq";
+      desktopName = "Bisq ${version} (HiDPI)";
+      genericName = "Decentralized bitcoin exchange";
+      categories = [ "Network" "P2P" ];
+    })
  ];

  unpackPhase = ''
@ -87,7 +96,10 @@ stdenv.mkDerivation rec {
    makeWrapper ${openjdk11}/bin/java $out/bin/bisq-desktop-wrapped \
      --add-flags "-jar $out/lib/desktop-${version}-all.jar bisq.desktop.app.BisqAppMain"

-    makeWrapper ${bisq-launcher} $out/bin/bisq-desktop \
+    makeWrapper ${bisq-launcher ""} $out/bin/bisq-desktop \
+      --prefix PATH : $out/bin
+
+    makeWrapper ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi \
      --prefix PATH : $out/bin

    for n in 16 24 32 48 64 96 128 256; do
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -667,8 +667,8 @@ let
        mktplcRef = {
          name = "ruff";
          publisher = "charliermarsh";
-          version = "2023.26.0";
-          sha256 = "sha256-5JaOo0BqTWo3NAdzS9DSClTwB9YiBhICEPOqWmBv270=";
+          version = "2023.30.0";
+          sha256 = "sha256-E/zgKNxKH05qzLkoyq66qBDbkNJ7liBvU+ZSxw825c0=";
        };
        meta = {
          license = lib.licenses.mit;
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@ -38,14 +38,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mame";
-  version = "0.255";
+  version = "0.256";
  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;

  src = fetchFromGitHub {
    owner = "mamedev";
    repo = "mame";
    rev = "mame${srcVersion}";
-    hash = "sha256-pdPKxEHxynBIB2lUG6yjKNcY8MlOlk4pfr7WwqaA9Dk=";
+    hash = "sha256-rQ1GQks3Nni6ALxfiJzdkKUgbZrXaLu9vJtEDPjgP3Q=";
  };

  outputs = [ "out" "tools" ];
--- a/pkgs/applications/file-managers/projectable/default.nix
+++ b/pkgs/applications/file-managers/projectable/default.nix
@ -0,0 +1,49 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libgit2_1_5
+, openssl
+, zlib
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "projectable";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "dzfrias";
+    repo = "projectable";
+    rev = version;
+    hash = "sha256-mN8kqh17qGJWOwrdH9fCPApFQBbgCs6FaVg38SNJGP0=";
+  };
+
+  cargoHash = "sha256-SQ117gFkqex3GFl7RnorSfPo7e0Eefg1l3L0Vyi/tpU=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgit2_1_5
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreServices
+  ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
+
+  meta = with lib; {
+    description = "A TUI file manager built for projects";
+    homepage = "https://github.com/dzfrias/projectable";
+    changelog = "https://github.com/dzfrias/projectable/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "prj";
+  };
+}
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/pkgs/applications/graphics/deskew/default.nix
@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
  buildPhase = ''
    runHook preBuild
    patchShebangs ./Scripts
+
+    # Deskew insists on using dlopen to load libtiff, we insist it links against it.
+    sed -i -e 's/{$DEFINE DYNAMIC_DLL_LOADING}//' Imaging/LibTiff/LibTiffDynLib.pas
+    sed -i -e 's/if LibTiffDynLib\.LoadTiffLibrary then//' Imaging/LibTiff/ImagingTiffLib.pas
+    # Make sure libtiff is in the RPATH, so that Nix can find and track the runtime dependency
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${lib.getLib libtiff}/lib"
    pushd Scripts && ./compile.sh && popd
    runHook postBuild
  '';
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@ -2,7 +2,7 @@

 let
  pname = "joplin-desktop";
-  version = "2.10.19";
+  version = "2.11.11";
  name = "${pname}-${version}";

  inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
  src = fetchurl {
    url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
    sha256 = {
-      x86_64-linux = "sha256-+QvaEB+4eA3grnqbLfFMEtNyizlvovtV/BvTa9gSZGU=";
-      x86_64-darwin = "sha256-BK951HLf+L1x9TDlqW11mNnnrnHfZ4qbKk25OIVXnuM=";
+      x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w=";
+      x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
    }.${system} or throwSystem;
  };

--- a/pkgs/applications/misc/leetcode-cli/default.nix
+++ b/pkgs/applications/misc/leetcode-cli/default.nix
@ -11,14 +11,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "leetcode-cli";
-  version = "0.3.11";
+  version = "0.4.1";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-DHtIhiRPRGuO6Rf1d9f8r0bMOHqAaJleUvYNyPiX6mc=";
+    sha256 = "sha256-8v10Oe3J0S9xp4b2UDOnv+W0UDgveK+mAyV3I/zZUGw=";
  };

-  cargoSha256 = "sha256-Suk/nQ+JcoD9HO9x1lYp+p4qx0DZ9dt0p5jPz0ZQB+k=";
+  cargoHash = "sha256-MdHk8i/murKcWi9gydyPyq/6r1SovKP04PMJyXXrCiQ=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  pname = "logseq";
-  version = "0.9.9";
+  version = "0.9.10";

  src = fetchurl {
    url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    hash = "sha256-DwxRhC8HKJnu1F9mfU3+UdpTjtKLhxs4LJY9A0cZvBo=";
+    hash = "sha256-en8ws0qdMY5j1o8oTkKcIHHQV+kCuQZzQbdFU97qAQE=";
    name = "${pname}-${version}.AppImage";
  };

--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "glooctl";
-  version = "1.14.8";
+  version = "1.14.9";

  src = fetchFromGitHub {
    owner = "solo-io";
    repo = "gloo";
    rev = "v${version}";
-    hash = "sha256-OnoOZw85RffGiAPiAM8WLg2TjW1REgirvfAjFYt8/yY=";
+    hash = "sha256-PJvr62slTW3IoauLtRH88BDMpf3qGOWADjj4L4wQBLo=";
  };

  subPackages = [ "projects/gloo/cli/cmd" ];
--- a/pkgs/applications/networking/cluster/helm-dashboard/default.nix
+++ b/pkgs/applications/networking/cluster/helm-dashboard/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "helm-dashboard";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchFromGitHub {
    owner = "komodorio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ukapQRTn19sNTnJ0PHc8sp8x+k1qFb3ioHZHvVtToVU=";
+    sha256 = "sha256-hjIo2AEXNcFK0z4op59NnC2R8GspF5t808DZ72AxgMw=";
  };

  vendorHash = "sha256-ROffm1SGYnhUcp46nzQ951eaeQdO1pb+f8AInm0eSq0=";
--- a/pkgs/applications/networking/cluster/k8sgpt/default.nix
+++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "k8sgpt";
-  version = "0.3.6";
+  version = "0.3.8";

  src = fetchFromGitHub {
    owner = "k8sgpt-ai";
    repo = "k8sgpt";
    rev = "v${version}";
-    hash = "sha256-GAEAl59bzCffsh0XYa61R/AwwoGyFfG0M1m1U2aQiis=";
+    hash = "sha256-61u6iGz1cloIKJ2UyyQGPOZJvnAax05sI4XA9NCpJso=";
  };

-  vendorHash = "sha256-g0Lgu0aC25+/MYoRKMqTN8Iu8j/KA4G1DBjbhOfPpjg=";
+  vendorHash = "sha256-vmTfiUuuHHRzCwgWWzE80bq3VceRSHqpEYV7Zo7SJAI=";

  CGO_ENABLED = 0;

--- a/pkgs/applications/networking/cluster/rke/default.nix
+++ b/pkgs/applications/networking/cluster/rke/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "rke";
-  version = "1.4.5";
+  version = "1.4.6";

  src = fetchFromGitHub {
    owner = "rancher";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";
+    hash = "sha256-P/VvRoTcJuuRuoTT0zhebibBQrM6sz9Vv+qPrWY+B9Y=";
  };

-  vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";
+  vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk=";

  subPackages = [ "." ];

--- a/pkgs/applications/networking/cluster/zarf/default.nix
+++ b/pkgs/applications/networking/cluster/zarf/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "zarf";
-  version = "0.27.1";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "defenseunicorns";
    repo = "zarf";
    rev = "v${version}";
-    hash = "sha256-R9naPTipxok29wRwVNEV66tKDykGyVQPXoWs80+MyGc=";
+    hash = "sha256-TE7XP+qZkFxmms1iWDH8ziO8Rvkuo8cz8NdnMC/VU4s=";
  };

-  vendorHash = "sha256-6hd1OEmEQ6bYdYa1UCSXfNDFM1aAiBF6tvPmAMulRyc=";
+  vendorHash = "sha256-5HIRwOTZwElU2Ej8EhwmTtqtL6r+Hc7Vp8XjqCulo34=";
  proxyVendor = true;

  preBuild = ''
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "seaweedfs";
-  version = "3.52";
+  version = "3.53";

  src = fetchFromGitHub {
    owner = "seaweedfs";
    repo = "seaweedfs";
    rev = version;
-    hash = "sha256-20z9gS4AWs0WiZir7fO/E1ou7H+sbySc1AX2IaPNng0=";
+    hash = "sha256-VfKzptMxT2ra1uVzbL52EWjEGHTxmnh5xZGiQpRivTU=";
  };

-  vendorHash = "sha256-sBvXNnZUblplDDHRy4agKSyafm2dBtS2PSMVO3MfckY=";
+  vendorHash = "sha256-kL6huukrM4YeU7uvj7abXOEAvRhm1Nfp4JODW4BTy0A=";

  subPackages = [ "weed" ];

--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@ -17,6 +17,7 @@
 , rich
 , semver
 , setuptools
+, tenacity
 , toml
 , tornado
 , tzlocal
@ -26,12 +27,12 @@

 buildPythonApplication rec {
  pname = "streamlit";
-  version = "1.21.0";
-  format = "wheel"; # source currently requires pipenv
+  version = "1.24.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version format;
-    hash = "sha256-BYYlmJUqkSbhZlLKpbyI7u6nsnc68lLi2szxyEzqrvQ=";
+    hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU=";
  };

  propagatedBuildInputs = [
@ -51,6 +52,7 @@ buildPythonApplication rec {
    rich
    semver
    setuptools
+    tenacity
    toml
    tornado
    tzlocal
@ -58,12 +60,20 @@ buildPythonApplication rec {
    watchdog
  ];

+  # pypi package does not include the tests, but cannot be built with fetchFromGitHub
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "streamlit"
+  ];
+
  postInstall = ''
    rm $out/bin/streamlit.cmd # remove windows helper
  '';

  meta = with lib; {
    homepage = "https://streamlit.io/";
+    changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}";
    description = "The fastest way to build custom ML tools";
    maintainers = with maintainers; [ yrashk ];
    license = licenses.asl20;
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@ -5,14 +5,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "snakemake";
-  version = "7.25.3";
+  version = "7.29.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "snakemake";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-KrstajTocVX5Tw7aiPoJ9vxJ0nKF+jqJcYJKrJvBt0Q=";
+    hash = "sha256-Y/z7asYSRgDyDWmvfmX4y6fOMSpp0X9uhDx327YF2TI=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/applications/version-management/git-graph/default.nix
+++ b/pkgs/applications/version-management/git-graph/default.nix
@ -0,0 +1,27 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "git-graph";
+  version = "unstable-2023-01-14";
+
+  src = fetchFromGitHub {
+    owner = "mlange-42";
+    repo = pname;
+    rev = "9bd54eb0aed6f108364bce9ad0bdff12077038fc";
+    hash = "sha256-tMM/mpt9yzZYSpnOGBuGLM0XTJiiyChfUrERMuyn3mQ=";
+  };
+
+  cargoHash = "sha256-ZLF/l2HnIbmkayWXhjYr01M6lGaGiK2UYyp654ncxgo=";
+
+  meta = with lib; {
+    description = "Command line tool to show clear git graphs arranged for your branching model";
+    homepage = "https://github.com/mlange-42/git-graph";
+    license = licenses.mit;
+    broken = stdenv.isDarwin;
+    maintainers = with maintainers; [ cafkafk ];
+  };
+}
--- a/pkgs/applications/version-management/git-quick-stats/default.nix
+++ b/pkgs/applications/version-management/git-quick-stats/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "git-quick-stats";
-  version = "2.4.0";
+  version = "2.5.0";

  src = fetchFromGitHub {
    repo = "git-quick-stats";
    owner = "arzzen";
    rev = version;
-    sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0=";
+    sha256 = "sha256-zUw0rjsYdH4mlqKXADvfqWCBM8tCL6BmVHq27JZLpd0=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/video/cutecapture/default.nix
+++ b/pkgs/applications/video/cutecapture/default.nix
@ -0,0 +1,47 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libusb1
+, sfml
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cutecapture";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Gotos";
+    repo = "cutecapture";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-V8BlZykh9zOTcEypu96Ft9/6CtjsybtD8lBsg9sF5sQ=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    libusb1
+    sfml
+  ];
+
+  postPatch = ''
+    cat > get_version.sh <<EOF
+    #!${stdenv.shell}
+    echo ${lib.escapeShellArg finalAttrs.version}
+    EOF
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/lib/udev/rules.d 95-{3,}dscapture.rules
+  '';
+
+  meta = with lib; {
+    description = "A (3)DS capture software for Linux and Mac";
+    homepage = "https://github.com/Gotos/CuteCapture";
+    license = licenses.asl20;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ raphaelr ];
+  };
+})
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "sarasa-gothic";
-  version = "0.41.2";
+  version = "0.41.3";

  src = fetchurl {
    # Use the 'ttc' files here for a smaller closure size.
    # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
    url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-    hash = "sha256-AkfjtXeZkwzXLu81hS43vYPEMKl3TV1TnQ4ryUSnblc=";
+    hash = "sha256-/VC9zhWC3jJuIXQ2fel6moLzrdsguPaylgfkY9FoClQ=";
  };

  sourceRoot = ".";
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "4744eb212287f09a540ba7de2a4837b504956ed4",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4744eb212287f09a540ba7de2a4837b504956ed4.tar.gz",
-  "sha256": "1lwdnjmndmixnv8saq68g45skf9yc3zq9npjm8gv9pdga7vy3m96",
-  "msg": "Update from Hackage at 2023-05-31T06:44:49Z"
+  "commit": "2951c03cb95b8892bd6d4eb89d135764c35a8d7f",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2951c03cb95b8892bd6d4eb89d135764c35a8d7f.tar.gz",
+  "sha256": "08sh9l9df2p51q4xhrl14jga48i0ad78fp7w3cccgcw1bqq4yxml",
+  "msg": "Update from Hackage at 2023-06-19T20:13:38Z"
 }
--- a/pkgs/development/compilers/ghc/9.6.1.nix
+++ b/pkgs/development/compilers/ghc/9.6.1.nix
@ -1,4 +0,0 @@
-import ./common-hadrian.nix rec {
-  version = "9.6.1";
-  sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb";
-}
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.7.20230505";
-  rev = "983ce55815f2dd57f84ee86eee97febf7d80b470";
-  sha256 = "sha256-U+LZIe9WbF/DF5Zn8w8wkRf4JJHxgdY2ahM517bwRo4=";
+  version = "9.7.20230527";
+  rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664";
+  sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2";
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -157,8 +157,57 @@ self: super: {
      "vector-tests-O0"
      "vector-tests-O2"
    ];
+    patches = [
+      # Workaround almost guaranteed floating point errors in test suite with quickcheck 2.14.3
+      # https://github.com/haskell/vector/issues/460
+      (pkgs.fetchpatch {
+        name = "vector-quickcheck-2.14.3-float-workaround.patch";
+        url = "https://github.com/haskell/vector/commit/df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c.patch";
+        sha256 = "040wg8mqlkdnrl5axy9wk0mlpn8rpc4vc4afpxignj9i7yc4pfjj";
+        stripLen = 1;
+     })
+   ];
  }) super.vector;

+  # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3
+  # https://github.com/haskell/math-functions/issues/73
+  math-functions = overrideCabal (drv: {
+    testFlags = drv.testFlags or [] ++ [ "-p" "! /Kahan.t_sum_shifted/" ];
+  }) super.math-functions;
+
+  # Deal with infinite and NaN values generated by QuickCheck-2.14.3
+  inherit (
+    let
+      aesonQuickCheckPatch = appendPatches [
+        (pkgs.fetchpatch {
+          name = "aeson-quickcheck-2.14.3-double-workaround.patch";
+          url = "https://github.com/haskell/aeson/commit/58766a1916b4980792763bab74f0c86e2a7ebf20.patch";
+          sha256 = "1jk2xyi9g6dfjsi6hvpvkpmag3ivimipwy1izpbidf3wvc9cixs3";
+        })
+      ];
+    in
+    {
+      aeson = aesonQuickCheckPatch super.aeson;
+      aeson_2_1_2_1 = aesonQuickCheckPatch super.aeson_2_1_2_1;
+    }
+  ) aeson
+    aeson_2_1_2_1
+    ;
+
+  # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
+  orbits = dontCheck super.orbits;
+
+  # 2023-06-28: Test error: https://hydra.nixos.org/build/225559546
+  monad-bayes = dontCheck super.monad-bayes;
+
+  # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3
+  # https://github.com/haskell/statistics/issues/205
+  statistics = overrideCabal (drv: {
+    testFlags = [
+      "-p" "! (/Pearson correlation/ || /t_qr/ || /Tests for: FDistribution.1-CDF is correct/)"
+    ];
+  }) super.statistics;
+
  # There are numerical tests on random data, that may fail occasionally
  lapack = dontCheck super.lapack;

@ -179,6 +228,10 @@ self: super: {
  # successfully with recent versions of the compiler).
  bin-package-db = null;

+  # Unnecessarily requires alex >= 3.3
+  # https://github.com/glguy/config-value/commit/c5558c8258598fab686c259bff510cc1b19a0c50#commitcomment-119514821
+  config-value = doJailbreak super.config-value;
+
  # waiting for release: https://github.com/jwiegley/c2hsc/issues/41
  c2hsc = appendPatch (fetchpatch {
    url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch";
@ -202,6 +255,9 @@ self: super: {
  ghc-datasize = disableLibraryProfiling super.ghc-datasize;
  ghc-vis = disableLibraryProfiling super.ghc-vis;

+  # 2023-06-10: Too strict version bound on https://github.com/haskell/ThreadScope/issues/118
+  threadscope = doJailbreak super.threadscope;
+
  # patat main branch has an unreleased commit that fixes the build by
  # relaxing restrictive upper boundaries. This can be removed once there's a
  # new release following version 0.8.8.0.
@ -570,6 +626,12 @@ self: super: {
  xsd = dontCheck super.xsd;
  zip-archive = dontCheck super.zip-archive;  # https://github.com/jgm/zip-archive/issues/57

+  # 2023-06-26: Test failure: https://hydra.nixos.org/build/224869905
+  comfort-blas = dontCheck super.comfort-blas;
+
+  # 2022-06-26: Too strict lower bound on semialign.
+  trie-simple = doJailbreak super.trie-simple;
+
  # These test suites run for ages, even on a fast machine. This is nuts.
  Random123 = dontCheck super.Random123;
  systemd = dontCheck super.systemd;
@ -1022,53 +1084,6 @@ self: super: {
  # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage.
  snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22

-  # Copy hledger man pages from data directory into the proper place. This code
-  # should be moved into the cabal2nix generator.
-  hledger = overrideCabal (drv: {
-    postInstall = ''
-      # Don't install files that don't belong into this package to avoid
-      # conflicts when hledger and hledger-ui end up in the same profile.
-      rm embeddedfiles/hledger-{api,ui,web}.*
-      for i in $(seq 1 9); do
-        for j in embeddedfiles/*.$i; do
-          mkdir -p $out/share/man/man$i
-          cp -v $j $out/share/man/man$i/
-        done
-      done
-      mkdir -p $out/share/info
-      cp -v embeddedfiles/*.info* $out/share/info/
-    '';
-  }) super.hledger;
-  hledger_1_29_2 = doDistribute (super.hledger_1_29_2.override {
-    hledger-lib = self.hledger-lib_1_29_2;
-  });
-  hledger-ui = overrideCabal (drv: {
-    postInstall = ''
-      for i in $(seq 1 9); do
-        for j in *.$i; do
-          mkdir -p $out/share/man/man$i
-          cp -v $j $out/share/man/man$i/
-        done
-      done
-      mkdir -p $out/share/info
-      cp -v *.info* $out/share/info/
-    '';
-  }) super.hledger-ui;
-  hledger-web = overrideCabal (drv: {
-    preCheck = "export HOME=$TMPDIR";
-    postInstall = ''
-      for i in $(seq 1 9); do
-        for j in *.$i; do
-          mkdir -p $out/share/man/man$i
-          cp -v $j $out/share/man/man$i/
-        done
-      done
-      mkdir -p $out/share/info
-      cp -v *.info* $out/share/info/
-    '';
-  }) super.hledger-web;
-
-
  # https://github.com/haskell-hvr/resolv/pull/6
  resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;

@ -1394,21 +1409,24 @@ self: super: {
    });
  };

-
-  # 2023-04-16: https://github.com/ghcjs/jsaddle/pull/137
-  jsaddle-webkit2gtk = lib.pipe super.jsaddle-webkit2gtk
-    [
-      (appendPatch (fetchpatch {
-        url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch";
-        hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w=";
-        relative = "jsaddle-webkit2gtk";
-      }))
-      (overrideCabal (old: {
-        postPatch = old.postPatch or "" + ''
-          sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal
-        '';
-      }))
-    ];
+  # 2023-06-24: too strict upper bound on bytestring
+  jsaddle-webkit2gtk =
+    appendPatches [
+      (pkgs.fetchpatch {
+        name = "jsaddle-webkit2gtk-ghc-9.2.patch";
+        url = "https://github.com/ghcjs/jsaddle/commit/d2ce9e6be1dcba0ab417314a0b848012d1a47e03.diff";
+        stripLen = 1;
+        includes = [ "jsaddle-webkit2gtk.cabal" ];
+        sha256 = "16pcs3l7s8shhcnrhi80bwjgy7w23csd9b8qpmc5lnxn4wxr4c2r";
+      })
+      (pkgs.fetchpatch {
+        name = "jsaddle-webkit2gtk-ghc-9.6.patch";
+        url = "https://github.com/ghcjs/jsaddle/commit/99b23dac8b4c5b23f5ed7963e681a46c1abdd1a5.patch";
+        sha256 = "02rdifap9vzf6bhjp5siw68ghjrxh2phzd0kwjihf3hxi4a2xlp3";
+        stripLen = 1;
+        includes = [ "jsaddle-webkit2gtk.cabal" ];
+      })
+    ] super.jsaddle-webkit2gtk;

  # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
  jsaddle-dom = overrideCabal (old: {
@ -1484,6 +1502,12 @@ self: super: {
    sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63";
  }) super.splot;

+  # Fix build with newer monad-logger: https://github.com/obsidiansystems/monad-logger-extras/pull/5
+  monad-logger-extras = appendPatch (fetchpatch {
+    url = "https://github.com/obsidiansystems/monad-logger-extras/commit/55d414352e740a5ecacf313732074d9b4cf2a6b3.patch";
+    sha256 = "sha256-xsQbr/QIrgWR0uwDPtV0NRTbVvP0tR9bY9NMe1JzqOw=";
+  }) super.monad-logger-extras;
+
  # Fails with encoding problems, likely needs locale data.
  # Test can be executed by adding which to testToolDepends and
  # $PWD/dist/build/haskeline-examples-Test to $PATH.
@ -1584,7 +1608,9 @@ self: super: {
  #   so add them to build input and also wrap the resulting binary so they're in
  #   PATH.
  # - Patch can be removed on next package set bump (for v0.2.11)
-  update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ];
+
+  # 2023-06-26: Test failure: https://hydra.nixos.org/build/225081865
+  update-nix-fetchgit = dontCheck (let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ];
  in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal
    (drv: {
      buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
@ -1593,7 +1619,7 @@ self: super: {
          lib.makeBinPath deps
        }"
      '';
-    }) (addTestToolDepends deps super.update-nix-fetchgit));
+    }) (addTestToolDepends deps super.update-nix-fetchgit)));

  # Raise version bounds: https://github.com/idontgetoutmuch/binary-low-level/pull/16
  binary-strict = appendPatches [
@ -2371,6 +2397,10 @@ self: super: {
    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;
+
  # lucid-htmx has restrictive upper bounds on lucid and servant:
  #
  #   Setup: Encountered missing or private dependencies:
@ -2608,7 +2638,7 @@ self: super: {

  # Tests fail due to the newly-build fourmolu not being in PATH
  # https://github.com/fourmolu/fourmolu/issues/231
-  fourmolu_0_12_0_0 = dontCheck (super.fourmolu_0_12_0_0.overrideScope (lself: lsuper: {
+  fourmolu_0_13_0_0 = dontCheck (super.fourmolu_0_13_0_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;
@ -2622,4 +2652,8 @@ self: super: {
    url = "https://github.com/vincenthz/hs-gauge/commit/3d7776f41187c70c4f0b4517e6a7dde10dc02309.patch";
    hash = "sha256-4osUMo0cvTvyDTXF8lY9tQbFqLywRwsc3RkHIhqSriQ=";
  }) super.gauge;
+
+  # Flaky QuickCheck tests
+  # https://github.com/Haskell-Things/ImplicitCAD/issues/441
+  implicit = dontCheck super.implicit;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@ -172,7 +172,7 @@ in {
  ghc-exactprint = overrideCabal (drv: {
    libraryHaskellDepends = with self; [ HUnit data-default fail filemanip free ghc-paths ordered-containers silently syb Diff ];
  })
-    self.ghc-exactprint_1_6_1_1;
+    self.ghc-exactprint_1_6_1_3;

  # needed to build servant
  http-api-data = super.http-api-data_0_5_1;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@ -76,6 +76,14 @@ self: super: {
  turtle = doDistribute self.turtle_1_6_1;
  aeson = doDistribute self.aeson_2_1_2_1;
  memory = doDistribute self.memory_0_18_0;
+  semigroupoids = doDistribute self.semigroupoids_6_0_0_1;
+  bifunctors = doDistribute self.bifunctors_5_6_1;
+  cabal-plan = doDistribute self.cabal-plan_0_7_3_0;
+  base-compat = doDistribute self.base-compat_0_13_0;
+  base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
+  semialign = doDistribute self.semialign_1_3;
+  assoc = doDistribute self.assoc_1_1;
+  strict = doDistribute self.strict_0_5;

  ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523;
  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523;
@ -111,15 +119,6 @@ self: super: {
  # Too strict bounds, waiting on Hackage release in nixpkgs
  #

-  # base >= 4.18 is allowed in those newer versions
-  boring = assert !(self ? boring_0_2_1); doJailbreak super.boring;
-  these = assert !(self ? assoc_1_2); doJailbreak super.these;
-
-  # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6
-  semigroupoids = doJailbreak super.semigroupoids;
-  # XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6
-  semialign = doJailbreak super.semialign;
-
  #
  # Compilation failure workarounds
  #
@ -183,9 +182,12 @@ self: super: {
  hiedb = dontCheck super.hiedb;
  retrie = dontCheck (super.retrie);

+  # break infinite recursion with foldable1-classes-compat's test suite, which depends on 'these'.
+  these = doDistribute (super.these_1_2.override { foldable1-classes-compat = dontCheck super.foldable1-classes-compat; });
+
  ghc-exactprint = unmarkBroken (addBuildDepends (with self.ghc-exactprint.scope; [
   HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
-  ]) super.ghc-exactprint_1_7_0_0);
+  ]) super.ghc-exactprint_1_7_0_1);

  inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
    hls-cabal-plugin
@ -200,5 +202,31 @@ self: super: {
    tree-diff
    implicit-hie-cradle
    focus
-    hie-compat;
+    hie-compat
+    xmonad-contrib              # mtl >=1 && <2.3
+    dbus       # template-haskell >=2.18 && <2.20, transformers <0.6, unix <2.8
+  ;
+
+  # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455
+  # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so
+  # the GHC 9.6 configuration may need similar overrides eventually.
+  X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft;
+  # Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309
+  glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib);
+  cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo);
+  pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango);
+
+  # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
+  gtk = doJailbreak super.gtk;
+
+  # Doctest comments have bogus imports.
+  bsb-http-chunked = dontCheck super.bsb-http-chunked;
+
+  # Fix ghc-9.6.x build errors.
+  libmpd = appendPatch
+    (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch";
+                       sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ=";
+                     })
+    super.libmpd;
+
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -100,6 +100,7 @@ broken-packages:
  - agda-snippets
  - agda-unused
  - AGI
+  - ag-pictgen # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/225557198 at 2023-06-28
  - AhoCorasick
  - aig
  - airbrake
@ -222,6 +223,7 @@ broken-packages:
  - ascii-string
  - ascii-vector-avc
  - asif
+  - asil # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/225556674 at 2023-06-28
  - asn1-ber-syntax
  - asn1-codec
  - asn1-data
@ -234,6 +236,7 @@ broken-packages:
  - assumpta
  - ast-monad
  - astrds
+  - astro #  failure  in job https://hydra.nixos.org/build/225575437 at 2023-06-28
  - async-combinators
  - async-dejafu
  - asynchronous-exceptions
@ -539,6 +542,7 @@ broken-packages:
  - cabal2doap
  - cabal2ebuild
  - cabal2ghci
+  - cabal2json # dependency missing in job https://hydra.nixos.org/build/225572535 at 2023-06-28
  - cabal-audit
  - cabal-auto-expose
  - cabal-bundle-clib
@ -668,6 +672,7 @@ broken-packages:
  - chaselev-deque
  - chatty-text
  - chatwork
+  - check-cfg-ambiguity #  failure  in job https://hydra.nixos.org/build/225575902 at 2023-06-28
  - checked
  - Checked
  - checkmate
@ -693,6 +698,7 @@ broken-packages:
  - cipher-des
  - circle
  - circlehs
+  - circular-enum # dependency missing in job https://hydra.nixos.org/build/225566485 at 2023-06-28
  - citeproc-hs
  - cjk
  - cj-token
@ -793,6 +799,7 @@ broken-packages:
  - commodities
  - compact
  - Compactable
+  - compactable # dependency missing in job https://hydra.nixos.org/build/225560369 at 2023-06-28
  - compact-list
  - compact-map
  - compact-sequences
@ -880,6 +887,7 @@ broken-packages:
  - contiguous-checked
  - contiguous-fft
  - continue
+  - continued-fractions #  failure  in job https://hydra.nixos.org/build/225575101 at 2023-06-28
  - contracheck-applicative
  - Contract
  - contra-tracers
@ -948,6 +956,7 @@ broken-packages:
  - crypto-keys-ssh
  - crypto-multihash
  - crypto-numbers
+  - crypton-x509 # failure building test suite 'test-x509' in job https://hydra.nixos.org/build/225569131 at 2023-06-28
  - crypto-pubkey-openssh
  - crypto-random-effect
  - crypto-simple
@ -969,6 +978,7 @@ broken-packages:
  - ctkl
  - cuboid
  - cuckoo-filter
+  - cuckoo # test failure in job https://hydra.nixos.org/build/225558690 at 2023-06-28
  - curl-aeson
  - curl-runnings
  - curly-expander
@ -1059,6 +1069,7 @@ broken-packages:
  - datetime-sb
  - dawdle
  - dawg
+  - daytripper #  failure  in job https://hydra.nixos.org/build/225578117 at 2023-06-28
  - dbcleaner
  - dbf
  - DBlimited
@ -1407,6 +1418,7 @@ broken-packages:
  - eventsource-api
  - eventsourced
  - eventstore
+  - ewe # failure building executable 'ewe' in job https://hydra.nixos.org/build/225555839 at 2023-06-28
  - exact-cover
  - exact-real-positional
  - except-exceptions
@ -1498,7 +1510,6 @@ broken-packages:
  - Feval
  - fez-conf
  - ffeed
-  - fft
  - ffunctor
  - fgl-extras-decompositions
  - fib
@ -1598,6 +1609,7 @@ broken-packages:
  - fortran-src-extras
  - foscam-filename
  - fpe
+  - fp-ieee # test failure in job https://hydra.nixos.org/build/225561952 at 2023-06-28
  - FPretty
  - fptest
  - fquery
@ -1630,6 +1642,7 @@ broken-packages:
  - fresnel
  - friday-devil
  - friday-scale-dct
+  - friday # test failure in job https://hydra.nixos.org/build/225561573 at 2023-06-28
  - frown
  - frp-arduino
  - frpnow
@ -1957,6 +1970,7 @@ broken-packages:
  - hadoop-streaming
  - hafar
  - Haggressive
+  - HaGL # test failure in job https://hydra.nixos.org/build/225563740 at 2023-06-28
  - hahp
  - haiji
  - hail
@ -1982,7 +1996,6 @@ broken-packages:
  - HaLeX
  - halfs
  - half-space
-  - halide-haskell # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/212823532 at 2023-03-22
  - halipeto
  - halive
  - halma
@ -2747,6 +2760,7 @@ broken-packages:
  - instant-generics
  - instapaper-sender
  - instinct
+  - integer-conversion # dependency missing in job https://hydra.nixos.org/build/225563519 at 2023-06-28
  - integer-pure
  - integer-simple
  - intensional-datatys
@ -2931,6 +2945,7 @@ broken-packages:
  - keccak
  - keenser
  - keera-hails-reactivevalues
+  - keid-render-basic #  failure  in job https://hydra.nixos.org/build/225578420 at 2023-06-28
  - keid-ui-dearimgui
  - keiretsu
  - kempe
@ -3191,6 +3206,7 @@ broken-packages:
  - lookup-tables
  - loopbreaker
  - loop-dsl
+  - looper # failure building test suite 'looper-test' in job https://hydra.nixos.org/build/225553593 at 2023-06-28
  - loops
  - loop-while
  - loopy
@ -3357,6 +3373,7 @@ broken-packages:
  - midi-simple
  - midisurface # dependency missing in job https://hydra.nixos.org/build/217805409 at 2023-04-29
  - midi-utils
+  - mighttpd2 #  failure  in job https://hydra.nixos.org/build/225576224 at 2023-06-28
  - mighty-metropolis # test failure in job https://hydra.nixos.org/build/214599789 at 2023-04-07
  - migrant-postgresql-simple
  - mikmod
@ -3448,6 +3465,7 @@ broken-packages:
  - monad-stlike-io
  - monad-task
  - monad-throw-exit
+  - monad-time-effectful # failure building library in job https://hydra.nixos.org/build/225552858 at 2023-06-28
  - monad-timing
  - monad-tree
  - monad-tx
@ -4114,6 +4132,7 @@ broken-packages:
  - polysemy-socket
  - polysemy-video
  - polysemy-vinyl
+  - poly # test failure in job https://hydra.nixos.org/build/225574715 at 2023-06-28
  - polytypeable
  - pomaps
  - pomohoro
@ -4607,6 +4626,8 @@ broken-packages:
  - SableCC2Hs
  - safe-buffer-monad
  - safe-coerce
+  - safe-coloured-text-gen # test failure in job https://hydra.nixos.org/build/225565471 at 2023-06-28
+  - safe-coloured-text-layout # test failure in job https://hydra.nixos.org/build/225562935 at 2023-06-28
  - safecopy-migrate
  - safecopy-store
  - safe-freeze
@ -4823,6 +4844,7 @@ broken-packages:
  - signable
  - signable-haskell-protoc
  - signed-multiset
+  - significant-figures # test failure in job https://hydra.nixos.org/build/225555677 at 2023-06-28
  - simd
  - simfin
  - simple-actors
@ -4988,6 +5010,7 @@ broken-packages:
  - sousit
  - soyuz
  - spacepart
+  - spade # dependency missing in job https://hydra.nixos.org/build/225563353 at 2023-06-28
  - spake2
  - spanout
  - spars
@ -5063,6 +5086,7 @@ broken-packages:
  - statistics-dirichlet
  - statistics-fusion
  - statistics-hypergeometric-genvar
+  - statistics-skinny #  failure  in job https://hydra.nixos.org/build/225576019 at 2023-06-28
  - stats
  - statsd
  - statvfs
@ -5196,7 +5220,12 @@ broken-packages:
  - sws
  - syb-extras
  - syb-with-class-instances-text
-  - sydtest
+  - sydtest-hedis # test failure in job https://hydra.nixos.org/build/225562212 at 2023-06-28
+  - sydtest-mongo #  failure  in job https://hydra.nixos.org/build/225574398 at 2023-06-28
+  - sydtest-persistent-postgresql # test failure in job https://hydra.nixos.org/build/225560820 at 2023-06-28
+  - sydtest-persistent-sqlite # test failure in job https://hydra.nixos.org/build/225566898 at 2023-06-28
+  - sydtest-rabbitmq # test failure in job https://hydra.nixos.org/build/225569272 at 2023-06-28
+  - sydtest-webdriver # test failure in job https://hydra.nixos.org/build/225552802 at 2023-06-28
  - syfco
  - sym
  - symantic
@ -5365,7 +5394,6 @@ broken-packages:
  - thorn
  - th-pprint
  - threadmanager
-  - threadscope
  - thread-supervisor # test failure in job https://hydra.nixos.org/build/214156434 at 2023-03-29
  - threepenny-editors
  - threepenny-gui-contextmenu
@ -5390,6 +5418,7 @@ broken-packages:
  - tidal-vis
  - tie-knot
  - tiempo
+  - tiger # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/225568410 at 2023-06-28
  - TigerHash
  - tightrope
  - tikzsd
@ -5669,7 +5698,6 @@ broken-packages:
  - util-plus
  - util-primitive
  - uuagc-bootstrap
-  - uuagc-cabal
  - uuagc-diagrams
  - uu-cco
  - uuid-aeson
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -53,6 +53,11 @@ 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.*
+
 extra-packages:
  - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
  - Cabal == 2.4.*                      # required for cabal-install etc.
@ -310,6 +315,7 @@ package-maintainers:
    - streamly
    - streamly-bytestring
    - taskwarrior
+    - threadscope
    - tz
    - weeder
    - witch
@ -699,6 +705,8 @@ supported-platforms:
  gi-gtkosxapplication:                         [ platforms.darwin ]
  gtk-mac-integration:                          [ platforms.darwin ]
  gtk3-mac-integration:                         [ platforms.darwin ]
+  halide-haskell:                               [ platforms.linux ]
+  halide-JuicyPixels:                           [ platforms.linux ]
  hommage-ds:                                   [ platforms.windows ]
  hpapi:                                        [ platforms.linux ] # limited by pkgs.papi
  hsignal:                                      [ platforms.x86 ] # -msse2
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 20.23
+# Stackage LTS 20.26
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -10,7 +10,7 @@ default-package-overrides:
  - ace ==0.6
  - acid-state ==0.16.1.2
  - action-permutations ==0.0.0.1
-  - active ==0.2.0.17
+  - active ==0.2.0.18
  - ad ==4.5.4
  - ad-delcont ==0.3.0.0
  - adjunctions ==4.4.2
@ -33,7 +33,7 @@ default-package-overrides:
  - aeson-picker ==0.1.0.6
  - aeson-pretty ==0.8.9
  - aeson-qq ==0.8.4
-  - aeson-schemas ==1.4.0.1
+  - aeson-schemas ==1.4.1.0
  - aeson-typescript ==0.4.2.0
  - aeson-value-parser ==0.19.7.1
  - aeson-yak ==0.1.1.3
@ -148,7 +148,7 @@ default-package-overrides:
  - base64-string ==0.2
  - base-compat ==0.12.2
  - base-compat-batteries ==0.12.2
-  - basement ==0.0.15
+  - basement ==0.0.16
  - base-orphans ==0.8.8.2
  - base-prelude ==1.6.1
  - base-unicode-symbols ==0.2.4.2
@ -157,13 +157,13 @@ default-package-overrides:
  - bazel-runfiles ==0.12
  - bbdb ==0.8
  - bcp47 ==0.2.0.6
-  - bcp47-orphans ==0.1.0.5
+  - bcp47-orphans ==0.1.0.6
  - bcrypt ==0.0.11
  - beam-core ==0.9.2.1
  - beam-migrate ==0.5.1.2
  - beam-postgres ==0.5.2.1
  - beam-sqlite ==0.5.1.2
-  - bech32 ==1.1.2
+  - bech32 ==1.1.3
  - bech32-th ==1.1.1
  - bench ==1.0.12
  - benchpress ==0.2.2.22
@ -203,7 +203,7 @@ default-package-overrides:
  - bitvec ==1.1.4.0
  - bitwise-enum ==1.0.1.0
  - blake2 ==0.3.0
-  - Blammo ==1.1.1.2
+  - Blammo ==1.1.2.0
  - blank-canvas ==0.7.3
  - blanks ==0.5.0
  - blas-carray ==0.1.0.2
@ -214,7 +214,7 @@ default-package-overrides:
  - blaze-builder ==0.4.2.2
  - blaze-html ==0.9.1.2
  - blaze-markup ==0.8.2.8
-  - blaze-svg ==0.3.6.1
+  - blaze-svg ==0.3.7
  - blaze-textual ==0.2.3.1
  - bloodhound ==0.21.0.0
  - bm ==0.1.1.0
@ -282,7 +282,7 @@ default-package-overrides:
  - c2hs ==0.28.8
  - cabal2spec ==2.6.3
  - cabal-appimage ==0.3.0.5
-  - cabal-clean ==0.2.20220819
+  - cabal-clean ==0.2.20230609
  - cabal-debian ==5.2.1
  - cabal-doctest ==1.0.9
  - cabal-file ==0.1.1
@ -378,7 +378,7 @@ default-package-overrides:
  - colour ==2.3.6
  - columnar ==1.0.0.0
  - combinatorial ==0.1.1
-  - comfort-array ==0.5.2.1
+  - comfort-array ==0.5.2.3
  - comfort-array-shape ==0.0
  - comfort-fftw ==0.0.0.1
  - comfort-graph ==0.0.3.2
@ -403,7 +403,7 @@ default-package-overrides:
  - composition-extra ==2.0.0
  - composition-prelude ==3.0.0.2
  - concise ==0.1.0.1
-  - concurrency ==1.11.0.2
+  - concurrency ==1.11.0.3
  - concurrent-extra ==0.7.0.12
  - concurrent-output ==1.10.18
  - concurrent-split ==0.0.1.1
@ -448,7 +448,7 @@ default-package-overrides:
  - copr-api ==0.1.0
  - core-data ==0.3.9.1
  - core-program ==0.6.8.0
-  - core-telemetry ==0.2.9.1
+  - core-telemetry ==0.2.9.3
  - core-text ==0.3.8.1
  - countable ==1.2
  - country ==0.2.3
@ -524,7 +524,7 @@ default-package-overrides:
  - data-default-instances-text ==0.0.1
  - data-default-instances-unordered-containers ==0.0.1
  - data-default-instances-vector ==0.0.1
-  - data-diverse ==4.7.0.0
+  - data-diverse ==4.7.1.0
  - datadog ==0.3.0.0
  - data-dword ==0.3.2.1
  - data-endian ==0.1.1
@ -554,7 +554,7 @@ default-package-overrides:
  - dawg-ord ==0.5.1.2
  - dbcleaner ==0.1.3
  - DBFunctor ==0.1.2.1
-  - dbus ==1.2.28
+  - dbus ==1.2.29
  - dbus-hslogger ==0.1.0.1
  - debian ==4.0.4
  - debian-build ==0.10.2.1
@ -564,7 +564,7 @@ default-package-overrides:
  - declarative ==0.5.4
  - deepseq-generics ==0.2.0.0
  - deferred-folds ==0.9.18.3
-  - dejafu ==2.4.0.4
+  - dejafu ==2.4.0.5
  - dense-linear-algebra ==0.1.0.0
  - dependent-map ==0.4.0.0
  - dependent-sum ==0.7.2.0
@ -590,7 +590,7 @@ default-package-overrides:
  - diagrams-core ==1.5.1
  - diagrams-lib ==1.4.5.2
  - diagrams-postscript ==1.5.1.1
-  - diagrams-rasterific ==1.4.2.2
+  - diagrams-rasterific ==1.4.2.3
  - diagrams-solve ==0.1.3
  - diagrams-svg ==1.4.3.1
  - di-core ==1.0.4
@ -617,7 +617,7 @@ default-package-overrides:
  - dlist ==1.0
  - dlist-instances ==0.1.1.1
  - dlist-nonempty ==0.1.2
-  - dns ==4.1.0
+  - dns ==4.1.1
  - docker ==0.7.0.1
  - dockerfile ==0.2.0
  - doclayout ==0.4.0.1
@ -683,12 +683,12 @@ default-package-overrides:
  - elm-bridge ==0.8.2
  - elm-core-sources ==1.0.0
  - elm-export ==0.6.0.1
-  - elynx ==0.7.2.0
-  - elynx-markov ==0.7.2.0
-  - elynx-nexus ==0.7.2.0
-  - elynx-seq ==0.7.2.0
-  - elynx-tools ==0.7.2.0
-  - elynx-tree ==0.7.2.0
+  - elynx ==0.7.2.1
+  - elynx-markov ==0.7.2.1
+  - elynx-nexus ==0.7.2.1
+  - elynx-seq ==0.7.2.1
+  - elynx-tools ==0.7.2.1
+  - elynx-tree ==0.7.2.1
  - emacs-module ==0.1.1.1
  - email-validate ==2.3.2.18
  - emojis ==0.1.2
@ -713,7 +713,7 @@ default-package-overrides:
  - errors ==2.3.0
  - errors-ext ==0.4.2
  - ersatz ==0.4.13
-  - esqueleto ==3.5.9.0
+  - esqueleto ==3.5.10.0
  - essence-of-live-coding ==0.2.7
  - essence-of-live-coding-gloss ==0.2.7
  - essence-of-live-coding-pulse ==0.2.7
@ -814,14 +814,14 @@ default-package-overrides:
  - FontyFruity ==0.5.3.5
  - force-layout ==0.4.0.6
  - foreign-store ==0.2
-  - ForestStructures ==0.0.1.0
+  - ForestStructures ==0.0.1.1
  - forkable-monad ==0.2.0.3
  - forma ==1.2.0
  - formatn ==0.2.2
  - format-numbers ==0.1.0.1
  - formatting ==7.1.3
  - fortran-src ==0.12.0
-  - foundation ==0.0.29
+  - foundation ==0.0.30
  - fourmolu ==0.9.0.0
  - freckle-app ==1.3.0.0
  - free ==5.1.10
@ -840,7 +840,7 @@ default-package-overrides:
  - funcmp ==1.9
  - function-builder ==0.3.0.1
  - functor-classes-compat ==2.0.0.2
-  - fused-effects ==1.1.2.1
+  - fused-effects ==1.1.2.2
  - fusion-plugin ==0.2.6
  - fusion-plugin-types ==0.1.0
  - fuzzcheck ==0.1.1
@ -901,7 +901,7 @@ default-package-overrides:
  - genvalidity-uuid ==1.0.0.1
  - genvalidity-vector ==1.0.0.0
  - geodetics ==0.1.2
-  - geojson ==4.1.0
+  - geojson ==4.1.1
  - getopt-generics ==0.13.1.0
  - ghc-bignum-orphans ==0.1.1
  - ghc-byteorder ==4.11.0.0.10
@ -945,7 +945,7 @@ default-package-overrides:
  - gi-gobject ==2.0.30
  - gi-graphene ==1.0.7
  - gi-gtk ==3.0.41
-  - gi-gtk-hs ==0.3.14
+  - gi-gtk-hs ==0.3.16
  - gi-gtksource ==3.0.28
  - gi-harfbuzz ==0.0.9
  - gi-javascriptcore ==4.0.27
@ -954,7 +954,7 @@ default-package-overrides:
  - githash ==0.1.6.3
  - github ==0.28.0.1
  - github-release ==2.0.0.6
-  - github-rest ==1.1.2
+  - github-rest ==1.1.3
  - github-types ==0.2.1
  - github-webhooks ==0.16.0
  - gitlab-haskell ==1.0.0.1
@ -985,7 +985,7 @@ default-package-overrides:
  - gpolyline ==0.1.0.1
  - graph-core ==0.3.0.0
  - graphite ==0.10.0.1
-  - graphql-client ==1.2.1
+  - graphql-client ==1.2.2
  - graphs ==0.7.2
  - graphula ==2.0.2.2
  - graphviz ==2999.20.1.0
@ -1027,11 +1027,11 @@ default-package-overrides:
  - hashmap ==1.3.3
  - hashtables ==1.3.1
  - haskeline ==0.8.2.1
-  - haskell-gi ==0.26.4
-  - haskell-gi-base ==0.26.3
+  - haskell-gi ==0.26.7
+  - haskell-gi-base ==0.26.4
  - haskell-gi-overloading ==1.0
  - haskell-lexer ==1.1.1
-  - HaskellNet ==0.6.0.2
+  - HaskellNet ==0.6.1.2
  - HaskellNet-SSL ==0.3.4.4
  - haskell-src ==1.0.4
  - haskell-src-exts ==1.23.1
@ -1094,7 +1094,7 @@ default-package-overrides:
  - hindent ==5.3.4
  - hinfo ==0.0.3.0
  - hinotify ==0.4.1
-  - hint ==0.9.0.6
+  - hint ==0.9.0.7
  - hip ==1.5.6.0
  - histogram-fill ==0.9.1.0
  - hjsmin ==0.2.0.4
@ -1223,7 +1223,7 @@ default-package-overrides:
  - http-client-restricted ==0.0.5
  - http-client-tls ==0.3.6.1
  - http-common ==0.8.3.4
-  - http-conduit ==2.3.8
+  - http-conduit ==2.3.8.1
  - http-date ==0.0.11
  - http-directory ==0.1.10
  - http-download ==0.2.0.0
@ -1329,7 +1329,7 @@ default-package-overrides:
  - interpolatedstring-perl6 ==1.0.2
  - interpolation ==0.1.1.2
  - Interpolation ==0.3.0
-  - IntervalMap ==0.6.2.0
+  - IntervalMap ==0.6.2.1
  - intervals ==0.9.2
  - intset-imperative ==0.1.0.0
  - invariant ==0.6.1
@ -1551,7 +1551,7 @@ default-package-overrides:
  - mcmc ==0.8.2.0
  - mcmc-types ==1.0.3
  - median-stream ==0.7.0.0
-  - med-module ==0.1.2.2
+  - med-module ==0.1.3
  - megaparsec ==9.2.2
  - megaparsec-tests ==9.2.2
  - mega-sdist ==0.4.2.1
@ -1620,7 +1620,7 @@ default-package-overrides:
  - monad-journal ==0.8.1
  - monadlist ==0.0.2
  - monadloc ==0.7.1
-  - monad-logger ==0.3.39
+  - monad-logger ==0.3.40
  - monad-logger-aeson ==0.4.0.4
  - monad-logger-json ==0.1.0.0
  - monad-logger-logstash ==0.2.0.2
@ -1697,7 +1697,7 @@ default-package-overrides:
  - nanospec ==0.2.2
  - nanovg ==0.8.1.0
  - nats ==1.1.2
-  - natural-arithmetic ==0.1.3.0
+  - natural-arithmetic ==0.1.4.0
  - natural-induction ==0.2.0.0
  - natural-sort ==0.1.2
  - natural-transformation ==0.4
@ -1707,7 +1707,7 @@ default-package-overrides:
  - netlib-carray ==0.1
  - netlib-comfort-array ==0.0.0.2
  - netlib-ffi ==0.1.1
-  - net-mqtt ==0.8.2.5
+  - net-mqtt ==0.8.3.0
  - net-mqtt-lens ==0.1.1.0
  - netpbm ==1.0.4
  - netrc ==0.2.0.0
@ -1724,7 +1724,7 @@ default-package-overrides:
  - network-messagepack-rpc-websocket ==0.1.1.1
  - network-multicast ==0.3.2
  - Network-NineP ==0.4.7.2
-  - network-run ==0.2.4
+  - network-run ==0.2.5
  - network-simple ==0.4.5
  - network-simple-tls ==0.4.1
  - network-transport ==0.5.6
@ -1765,8 +1765,8 @@ default-package-overrides:
  - NumInstances ==1.4
  - numtype-dk ==0.5.0.3
  - nuxeo ==0.3.2
-  - nvim-hs ==2.3.2.1
-  - nvim-hs-contrib ==2.0.0.1
+  - nvim-hs ==2.3.2.3
+  - nvim-hs-contrib ==2.0.0.2
  - nvim-hs-ghcid ==2.0.1.0
  - oauthenticated ==0.3.0.0
  - ObjectName ==1.1.0.2
@ -1782,7 +1782,7 @@ default-package-overrides:
  - OneTuple ==0.3.1
  - Only ==0.1
  - oo-prototypes ==0.1.0.0
-  - opaleye ==0.9.6.2
+  - opaleye ==0.9.7.0
  - OpenAL ==1.7.0.5
  - openapi3 ==3.2.3
  - open-browser ==0.2.1.0
@ -1945,7 +1945,7 @@ default-package-overrides:
  - polysemy-several ==0.1.1.0
  - polysemy-webserver ==0.2.1.1
  - polysemy-zoo ==0.8.1.0
-  - pontarius-xmpp ==0.5.6.5
+  - pontarius-xmpp ==0.5.6.6
  - pooled-io ==0.0.2.3
  - portable-lines ==0.1
  - port-utils ==0.2.1.0
@ -2041,7 +2041,7 @@ default-package-overrides:
  - qrcode-juicypixels ==0.8.5
  - quadratic-irrational ==0.1.1
  - QuasiText ==0.1.2.6
-  - QuickCheck ==2.14.2
+  - QuickCheck ==2.14.3
  - quickcheck-arbitrary-adt ==0.3.1.0
  - quickcheck-assertions ==0.3.0
  - quickcheck-classes ==0.6.5.0
@ -2051,7 +2051,7 @@ default-package-overrides:
  - quickcheck-io ==0.2.0
  - quickcheck-simple ==0.1.1.1
  - quickcheck-special ==0.1.0.6
-  - quickcheck-state-machine ==0.7.2
+  - quickcheck-state-machine ==0.7.3
  - quickcheck-text ==0.1.2.1
  - quickcheck-transformer ==0.3.1.2
  - quickcheck-unicode ==1.0.1.0
@ -2205,7 +2205,7 @@ default-package-overrides:
  - sample-frame-np ==0.0.5
  - sampling ==0.3.5
  - sandi ==0.5
-  - sandwich ==0.1.3.2
+  - sandwich ==0.1.4.0
  - sandwich-hedgehog ==0.1.3.0
  - sandwich-quickcheck ==0.1.0.7
  - sandwich-slack ==0.1.1.0
@ -2289,7 +2289,7 @@ default-package-overrides:
  - servant-static-th ==1.0.0.0
  - servant-subscriber ==0.7.0.0
  - servant-swagger ==1.1.11
-  - servant-swagger-ui ==0.3.5.4.5.0
+  - servant-swagger-ui ==0.3.5.5.0.0
  - servant-swagger-ui-core ==0.3.5
  - servant-swagger-ui-redoc ==0.3.4.1.22.3
  - servant-websockets ==2.0.0
@ -2362,8 +2362,8 @@ default-package-overrides:
  - skylighting-format-latex ==0.1
  - slack-progressbar ==0.1.0.1
  - slave-thread ==1.1.0.2
-  - slynx ==0.7.2.0
-  - smallcheck ==1.2.1
+  - slynx ==0.7.2.1
+  - smallcheck ==1.2.1.1
  - smtp-mail ==0.3.0.0
  - snowflake ==0.1.1.1
  - socket ==0.8.3.0
@ -2576,7 +2576,7 @@ default-package-overrides:
  - termbox-bindings-c ==0.1.0
  - termbox-bindings-hs ==0.1.0
  - termbox-tea ==0.1.0
-  - terminal-progress-bar ==0.4.1
+  - terminal-progress-bar ==0.4.2
  - terminal-size ==0.3.4
  - termonad ==4.4.0.0
  - test-framework ==0.8.2.0
@ -2604,7 +2604,7 @@ default-package-overrides:
  - text-regex-replace ==0.1.1.5
  - text-rope ==0.2
  - text-short ==0.1.5
-  - text-show ==3.10.2
+  - text-show ==3.10.3
  - text-show-instances ==3.9.5
  - text-zipper ==0.12
  - tfp ==1.0.2
@ -2665,7 +2665,7 @@ default-package-overrides:
  - tls ==1.5.8
  - tls-debug ==0.4.8
  - tls-session-manager ==0.0.4
-  - tlynx ==0.7.2.0
+  - tlynx ==0.7.2.1
  - tmapchan ==0.0.3
  - tmapmvar ==0.0.4
  - tmp-postgres ==1.34.1.0
@ -2673,7 +2673,7 @@ default-package-overrides:
  - tmp-proc-postgres ==0.5.2.2
  - tmp-proc-rabbitmq ==0.5.1.2
  - tmp-proc-redis ==0.5.1.2
-  - toml-reader ==0.2.0.0
+  - toml-reader ==0.2.1.0
  - tophat ==1.0.5.1
  - topograph ==1.0.0.2
  - torrent ==10000.1.3
@ -2681,7 +2681,7 @@ default-package-overrides:
  - tostring ==0.2.1.1
  - tracing ==0.0.7.3
  - tracing-control ==0.0.7.3
-  - transaction ==0.1.1.3
+  - transaction ==0.1.1.4
  - transformers-base ==0.4.6
  - transformers-compat ==0.7.2
  - transformers-either ==0.1.4
@ -2771,7 +2771,7 @@ default-package-overrides:
  - unix-compat ==0.5.4
  - unix-time ==0.4.9
  - unjson ==0.15.4
-  - unliftio ==0.2.24.0
+  - unliftio ==0.2.25.0
  - unliftio-core ==0.2.1.0
  - unliftio-path ==0.0.2.0
  - unliftio-pool ==0.2.2.0
@ -2827,6 +2827,7 @@ default-package-overrides:
  - vector-bytes-instances ==0.1.1
  - vector-circular ==0.1.4
  - vector-extras ==0.2.8
+  - vector-hashtables ==0.1.1.3
  - vector-instances ==3.4.2
  - vector-mmap ==0.0.3
  - vector-rotcev ==0.1.0.2
@ -2966,7 +2967,7 @@ default-package-overrides:
  - xor ==0.0.1.1
  - xss-sanitize ==0.3.7.2
  - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.11.0
+  - yaml ==0.11.11.1
  - yaml-unscrambler ==0.1.0.13
  - Yampa ==0.13.7
  - yarn-lock ==0.6.5
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -240,7 +240,6 @@ dont-distribute-packages:
 - JsContracts
 - JsonGrammar
 - JuPyTer-notebook
- - JuicyPixels-scale-dct
 - JunkDB-driver-gdbm
 - JunkDB-driver-hashtables
 - KiCS
@ -287,6 +286,7 @@ dont-distribute-packages:
 - MuCheck-SmallCheck
 - MutationOrder
 - NGLess
+ - NTRU
 - NaperianNetCDF
 - NaturalLanguageAlphabets
 - NearContextAlgebra
@ -452,7 +452,6 @@ dont-distribute-packages:
 - aeson-native
 - affine
 - afv
- - ag-pictgen
 - agda-server
 - agda-snippets-hakyll
 - agentx
@ -660,7 +659,6 @@ dont-distribute-packages:
 - apiary-websockets
 - apis
 - apotiki
- - appendful-persistent
 - approx-rand-test
 - arbor-monad-metric-datadog
 - archive-tar-bytestring
@ -680,7 +678,6 @@ dont-distribute-packages:
 - ascii-th_1_2_0_0
 - ascii_1_7_0_0
 - asic
- - asil
 - assert4hs-hspec
 - assert4hs-tasty
 - assimp
@ -810,7 +807,6 @@ dont-distribute-packages:
 - bitcoin-tx
 - bitcoin-types
 - bitcoind-regtest
- - bitfield
 - bitly-cli
 - bitmaps
 - bittorrent
@ -881,7 +877,6 @@ dont-distribute-packages:
 - cabal-query
 - cabal-test
 - cabal2arch
- - cabal2json
 - cabalmdvrpm
 - cabalrpmdeps
 - caffegraph
@ -1033,7 +1028,6 @@ dont-distribute-packages:
 - compact-mutable
 - compact-mutable-vector
 - compact-socket
- - compactable
 - compdata-automata
 - compdata-dags
 - compdata-param
@ -1124,6 +1118,10 @@ dont-distribute-packages:
 - cryptoids
 - cryptoids-class
 - cryptol
+ - crypton-connection
+ - crypton-x509-store
+ - crypton-x509-system
+ - crypton-x509-validation
 - crystalfontz
 - csound-catalog
 - csound-controllers
@ -1135,7 +1133,6 @@ dont-distribute-packages:
 - csv-enumerator
 - ctpl
 - cube
- - cuckoo
 - cv-combinators
 - cypher
 - daino
@ -1397,7 +1394,6 @@ dont-distribute-packages:
 - eventuo11y-otel
 - eventuo11y-prometheus
 - every-bit-counts
- - ewe
 - exference
 - exinst-aeson
 - exinst-base
@ -1513,7 +1509,7 @@ dont-distribute-packages:
 - fpnla-examples
 - frame-markdown
 - freckle-app
- - freckle-app_1_9_0_2
+ - freckle-app_1_9_0_3
 - free-functors
 - free-game
 - free-theorems-counterexamples
@ -1524,6 +1520,7 @@ dont-distribute-packages:
 - freelude
 - freer-converse
 - fresnel-fused-effects
+ - friday-juicypixels
 - front
 - frpnow-gloss
 - frpnow-gtk
@ -1574,14 +1571,7 @@ dont-distribute-packages:
 - geni-util
 - geniconvert
 - geniserver
- - genvalidity-appendful
- - genvalidity-dirforest
 - genvalidity-network-uri
- - genvalidity-sydtest
- - genvalidity-sydtest-aeson
- - genvalidity-sydtest-hashable
- - genvalidity-sydtest-lens
- - genvalidity-sydtest-persistent
 - geo-uk
 - geodetic
 - geolite-csv
@ -1932,7 +1922,6 @@ dont-distribute-packages:
 - hakyll-ogmarkup
 - hakyll-shortcut-links
 - halberd
- - halide-JuicyPixels
 - halide-arrayfire
 - hall-symbols
 - halma-gui
@ -1970,7 +1959,6 @@ dont-distribute-packages:
 - hascat-setup
 - hascat-system
 - hashable-accelerate
- - hashes
 - hashflare
 - hask-home
 - haskdeep
@ -2288,6 +2276,7 @@ dont-distribute-packages:
 - htsn-import
 - http-client-auth
 - http-client-rustls
+ - http-client-tls_0_3_6_2
 - http-enumerator
 - http2-client-grpc
 - http2-grpc-proto-lens
@ -2345,6 +2334,7 @@ dont-distribute-packages:
 - ideas-math-types
 - ideas-statistics
 - ige-mac-integration
+ - igrf
 - ihaskell-rlangqq
 - ihttp
 - imap
@ -2674,7 +2664,6 @@ dont-distribute-packages:
 - loli
 - longshot
 - loop-effin
- - looper
 - lorentz
 - lostcities
 - loup
@ -2797,6 +2786,7 @@ dont-distribute-packages:
 - monetdb-mapi
 - mongrel2-handler
 - monky
+ - monoidmap
 - monte-carlo
 - moo
 - moonshine
@ -2905,6 +2895,7 @@ dont-distribute-packages:
 - nettle-openflow
 - network-anonymous-i2p
 - network-anonymous-tor
+ - network-conduit-tls_1_4_0
 - network-connection
 - network-enumerator
 - network-hans
@ -2945,6 +2936,7 @@ dont-distribute-packages:
 - nri-test-encoding
 - numerals-base
 - numeric-ode
+ - numeric-optimization-backprop
 - numerical
 - numhask-hedgehog
 - numhask-range
@ -3242,6 +3234,7 @@ dont-distribute-packages:
 - queryparser-presto
 - queryparser-vertica
 - queuelike
+ - quic
 - quickbench
 - quickcheck-poly
 - quickcheck-regex
@ -3378,7 +3371,6 @@ dont-distribute-packages:
 - remotion
 - repa-array
 - repa-convert
- - repa-fftw
 - repa-flow
 - repa-plugin
 - repa-stream
@ -3450,6 +3442,7 @@ dont-distribute-packages:
 - rose-trie
 - roshask
 - rosmsg-bin
+ - rounded-hw
 - roundtrip-xml
 - route-generator
 - route-planning
@ -3465,8 +3458,6 @@ dont-distribute-packages:
 - runtime-arbitrary
 - rv
 - s-expression
- - safe-coloured-text-gen
- - safe-coloured-text-layout
 - safe-coloured-text-layout-gen
 - safe-coupling
 - safe-plugins
@ -3798,24 +3789,7 @@ dont-distribute-packages:
 - swapper
 - sweet-egison
 - switch
- - sydtest-aeson
 - sydtest-amqp
- - sydtest-autodocodec
- - sydtest-hedgehog
- - sydtest-hedgehog_0_4_0_0
- - sydtest-hedis
- - sydtest-hspec
- - sydtest-hspec_0_4_0_0
- - sydtest-mongo
- - sydtest-persistent
- - sydtest-persistent-postgresql
- - sydtest-persistent-sqlite
- - sydtest-process
- - sydtest-rabbitmq
- - sydtest-servant
- - sydtest-typed-process
- - sydtest-wai
- - sydtest-webdriver
 - sydtest-webdriver-screenshot
 - sydtest-webdriver-yesod
 - sydtest-yesod
@ -3893,7 +3867,6 @@ dont-distribute-packages:
 - thumbnail-polish
 - tic-tac-toe
 - tickle
- - tiger
 - tighttp
 - timberc
 - time-exts
@ -3915,11 +3888,11 @@ dont-distribute-packages:
 - tlex-encoding
 - tlex-th
 - tls-extra
+ - tls_1_7_0
 - tn
 - to-string-instances
 - toboggan
 - todos
- - token-limiter-concurrent
 - toktok
 - tomlcheck
 - tonatona
@ -4060,7 +4033,6 @@ dont-distribute-packages:
 - uu-cco-hut-parsing
 - uu-cco-uu-parsinglib
 - uu-options
- - uuagc
 - uuid-crypto
 - uvector-algorithms
 - v4l2
@ -4132,6 +4104,7 @@ dont-distribute-packages:
 - waldo
 - warp-grpc
 - warp-quic
+ - warp_3_3_27
 - warped
 - wavesurfer
 - wavy
@ -4192,6 +4165,7 @@ dont-distribute-packages:
 - wumpus-drawing
 - wumpus-microprint
 - wumpus-tree
+ - wuss_2_0_1_4
 - wx
 - wxAsteroids
 - wxFruit
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -192,6 +192,8 @@ self: super: builtins.intersectAttrs super {
  # Link the proper version.
  zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

+  threadscope = enableSeparateBinOutput super.threadscope;
+
  # Use the default version of mysql to build this package (which is actually mariadb).
  # test phase requires networking
  mysql = dontCheck super.mysql;
@ -214,6 +216,55 @@ self: super: builtins.intersectAttrs super {
    '';
  }) super.nvvm;

+  # hledger* overrides
+  inherit (
+    let
+      # Copy hledger man pages from the source tarball into the proper place.
+      # It always contains the relevant man page(s) at the top level. For
+      # hledger it additionally has all the other man pages in embeddedfiles/
+      # which we ignore.
+      installHledgerManPages = overrideCabal (drv: {
+        buildTools = drv.buildTools or [] ++ [
+          pkgs.buildPackages.installShellFiles
+        ];
+        postInstall = ''
+          for i in $(seq 1 9); do
+            installManPage *.$i
+          done
+
+          install -v -Dm644 *.info* -t "$out/share/info/"
+        '';
+      });
+
+      hledgerWebTestFix = overrideCabal (drv: {
+        preCheck = ''
+          ${drv.preCheck or ""}
+          export HOME="$(mktemp -d)"
+        '';
+      });
+    in
+    {
+      hledger = installHledgerManPages super.hledger;
+      hledger-web = installHledgerManPages (hledgerWebTestFix super.hledger-web);
+      hledger-ui = installHledgerManPages super.hledger-ui;
+
+      hledger_1_30_1 = installHledgerManPages
+        (doDistribute (super.hledger_1_30_1.override {
+          hledger-lib = self.hledger-lib_1_30;
+        }));
+      hledger-web_1_30 = installHledgerManPages (hledgerWebTestFix
+        (doDistribute (super.hledger-web_1_30.override {
+          hledger = self.hledger_1_30_1;
+          hledger-lib = self.hledger-lib_1_30;
+        })));
+    }
+  ) hledger
+    hledger-web
+    hledger-ui
+    hledger_1_30_1
+    hledger-web_1_30
+    ;
+
  cufft = overrideCabal (drv: {
    preConfigure = ''
      export CUDA_PATH=${pkgs.cudatoolkit}
@ -232,6 +283,13 @@ self: super: builtins.intersectAttrs super {
  sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;

  # avoid compiling twice by providing executable as a separate output (with small closure size)
+  cabal-fmt = enableSeparateBinOutput super.cabal-fmt;
+  hindent = enableSeparateBinOutput super.hindent;
+  releaser  = enableSeparateBinOutput super.releaser;
+  eventlog2html = enableSeparateBinOutput super.eventlog2html;
+  ghc-debug-brick  = enableSeparateBinOutput super.ghc-debug-brick;
+  nixfmt  = enableSeparateBinOutput super.nixfmt;
+  calligraphy = enableSeparateBinOutput super.calligraphy;
  niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv);
  ghcid = enableSeparateBinOutput super.ghcid;
  ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu);
@ -264,18 +322,18 @@ self: super: builtins.intersectAttrs super {
  gio = lib.pipe super.gio
    [ (disableHardening ["fortify"])
      (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
-      (addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux pcre ]
-                                       ++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else [])))
+      (addPkgconfigDepends (with pkgs; [ glib pcre2 pcre ]
+                                       ++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
    ];
  glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib));
  gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; });
  gtk = lib.pipe super.gtk (
    [ (disableHardening ["fortify"])
      (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools)
-      (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 util-linux pcre fribidi
+      (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 pcre fribidi
                                         libthai libdatrie xorg.libXdmcp libdeflate
                                        ]
-                                       ++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else [])))
+                                       ++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ]))
    ] ++
    ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] )
  );
@ -970,7 +1028,8 @@ self: super: builtins.intersectAttrs super {
        wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
          pkgs.lib.makeBinPath [
            pkgs.nvchecker
-            pkgs.nix-prefetch
+            pkgs.nix # nix-prefetch-url
+            pkgs.nix-prefetch-git
            pkgs.nix-prefetch-docker
          ]
        }"
@ -1239,4 +1298,9 @@ self: super: builtins.intersectAttrs super {
  # Disable checks to break dependency loop with SCalendar
  scalendar = dontCheck super.scalendar;

+  halide-haskell = super.halide-haskell.override { Halide = pkgs.halide; };
+  # Sydtest has a brittle test suite that will only work with the exact
+
+  # versions that it ships with.
+  sydtest = dontCheck super.sydtest;
 }
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@ -34,7 +34,7 @@ in
 , doInstallIntermediates ? false
 , editedCabalFile ? null
 # aarch64 outputs otherwise exceed 2GB limit
-, enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false)
+, enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.hostPlatform.isAarch64 or false)
 , enableExecutableProfiling ? false
 , profilingDetail ? "exported-functions"
 # TODO enable shared libs for cross-compiling
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@ -55,6 +55,12 @@ let
  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
                  else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"
                    + lib.optionalString (ghc ? hadrian) "/lib";
+  # Boot libraries for GHC are present in a separate directory.
+  bootLibDir    = let arch = if stdenv.targetPlatform.isAarch64
+                             then "aarch64"
+                             else "x86_64";
+                      platform = if stdenv.targetPlatform.isDarwin then "osx" else "linux";
+                  in "${ghc}/lib/${ghc.haskellCompilerName}/lib/${arch}-${platform}-${ghc.haskellCompilerName}";
  docDir        = "$out/share/doc/ghc/html";
  packageCfgDir = "${libDir}/package.conf.d";
  paths         = lib.concatLists (
@ -131,11 +137,17 @@ symlinkJoin {
  '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
    # Work around a linker limit in macOS Sierra (see generic-builder.nix):
    local packageConfDir="${packageCfgDir}";
-    local dynamicLinksDir="$out/lib/links"
+    local dynamicLinksDir="$out/lib/links";
    mkdir -p $dynamicLinksDir
    # Clean up the old links that may have been (transitively) included by
    # symlinkJoin:
    rm -f $dynamicLinksDir/*
+
+    # Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately.
+    if [[ -x "${bootLibDir}" ]]; then
+      ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir
+    fi
+
    for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
      ln -s $d/*.dylib $dynamicLinksDir
    done
@ -146,7 +158,7 @@ symlinkJoin {
      # $dynamicLinksDir
      cp $f $f-tmp
      rm $f
-      sed "N;s,dynamic-library-dirs:\s*.*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
+      sed "N;s,dynamic-library-dirs:\s*.*\n,dynamic-library-dirs: $dynamicLinksDir\n," $f-tmp > $f
      rm $f-tmp
    done
  '') + ''
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, looseversion
+, mmtf-python
+, nose
+, numpy
+, pandas
+, pythonRelaxDepsHook
+}:
+
+buildPythonPackage rec {
+  pname = "biopandas";
+  version = "0.4.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "BioPandas";
+    repo = "biopandas";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PRdemBo+bB2xJWmF2NylFTfNwEEo67i6XSaeDAFmQ/c=";
+  };
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "looseversion"
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    pandas
+    mmtf-python
+    looseversion
+  ];
+
+  nativeCheckInputs = [
+    nose
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    nosetests
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [
+    "biopandas"
+  ];
+
+  meta = {
+    description = "Working with molecular structures in pandas DataFrames";
+    homepage = "https://github.com/BioPandas/biopandas";
+    changelog = "https://github.com/BioPandas/biopandas/releases/tag/${src.rev}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, googleapis-common-protos
+, grpcio
+, protobuf
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "clarifai-grpc";
+  version = "9.5.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-amMUgRXtvcrALfWwat7W0W60FJQnEeMvHhyxxBCMqUg=";
+  };
+
+  propagatedBuildInputs = [
+    googleapis-common-protos
+    grpcio
+    protobuf
+    requests
+  ];
+
+  # almost all tests require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "clarifai_grpc" ];
+
+  meta = with lib; {
+    description = "Clarifai gRPC API Client";
+    homepage = "https://github.com/Clarifai/clarifai-python-grpc";
+    changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, clarifai-grpc
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "clarifai";
+  version = "9.5.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "Clarifai";
+    repo = "clarifai-python-utils";
+    rev = "refs/tags/${version}";
+    hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo=";
+  };
+
+  propagatedBuildInputs = [
+    clarifai-grpc
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "clarifai" ];
+
+  meta = with lib; {
+    description = "Clarifai Python Utilities";
+    homepage = "https://github.com/Clarifai/clarifai-python-utils";
+    changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@ -17,6 +17,7 @@
 , bash
  # optional dependencies
 , anthropic
+, clarifai
 , cohere
 , openai
 , nlpcloud
@ -35,6 +36,7 @@
 , faiss
 , spacy
 , nltk
+, wikipedia
 , beautifulsoup4
 , tiktoken
 , jinja2
@ -77,7 +79,7 @@

 buildPythonPackage rec {
  pname = "langchain";
-  version = "0.0.216";
+  version = "0.0.218";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -86,7 +88,7 @@ buildPythonPackage rec {
    owner = "hwchase17";
    repo = "langchain";
    rev = "refs/tags/v${version}";
-    hash = "sha256-g01EMquASxXl9drLhKtTwG9+gSa17aBq0c8UXcErCjI=";
+    hash = "sha256-8ru3Rp1bRLVivfXAFNfZYfV3DgHuHNEuCrKoqL1O0zo=";
  };

  postPatch = ''
@ -123,6 +125,7 @@ buildPythonPackage rec {
  passthru.optional-dependencies = {
    llms = [
      anthropic
+      clarifai
      cohere
      openai
      nlpcloud
@ -140,6 +143,9 @@ buildPythonPackage rec {
    text_helpers = [
      chardet
    ];
+    clarifai = [
+      clarifai
+    ];
    cohere = [
      cohere
    ];
@ -157,6 +163,7 @@ buildPythonPackage rec {
    ];
    all = [
      anthropic
+      clarifai
      cohere
      openai
      nlpcloud
@ -171,7 +178,7 @@ buildPythonPackage rec {
      transformers
      spacy
      nltk
-      # wikipedia
+      wikipedia
      beautifulsoup4
      tiktoken
      torch
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@ -0,0 +1,64 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, setuptools
+, typing-extensions
+, orjson
+, msgpack
+, pyyaml
+, tomli-w
+, tomli
+, pytestCheckHook
+, ciso8601
+, pendulum
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+  pname = "mashumaro";
+  version = "3.8.1";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Fatal1ty";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WDKohmcdVlQR/6AMSISN0y6UQx4tmOf1fANCPLRYiqI=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    typing-extensions
+  ];
+
+  passthru.optional-dependencies = {
+    orjson = [ orjson ];
+    msgpack = [ msgpack ];
+    yaml = [ pyyaml ];
+    toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  };
+
+  nativeCheckInputs = [
+    ciso8601
+    pendulum
+    pytest-mock
+    pytestCheckHook
+  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
+
+  pythonImportsCheck = [
+    "mashumaro"
+  ];
+
+  meta = with lib; {
+    description = "Fast and well tested serialization library on top of dataclasses";
+    homepage = "https://github.com/Fatal1ty/mashumaro";
+    changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tjni ];
+  };
+}
--- a/pkgs/development/python-modules/mmtf-python/default.nix
+++ b/pkgs/development/python-modules/mmtf-python/default.nix
@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, msgpack
+, numpy
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "mmtf-python";
+  version = "1.1.3";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-EqAv4bcTHworjORbRvHgzdKLmBj+RJlVTCaISYfqDDI=";
+  };
+
+  propagatedBuildInputs = [
+    msgpack
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  unittestFlagsArray = [
+    "-s mmtf/tests"
+    "-p \"*_tests.py\""
+  ];
+
+  pythonImportsCheck = [
+    "mmtf"
+  ];
+
+  meta = {
+    description = "The python implementation of the MMTF API, decoder and encoder";
+    homepage = "https://github.com/rcsb/mmtf-python";
+    changelog = "https://github.com/rcsb/mmtf-python/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "openhomedevice";
-  version = "2.1";
+  version = "2.2";
  format = "setuptools";

  disabled = pythonOlder "3.5";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "bazwilliams";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-KNQelldqHx4m8IfgGUwWw/+AVzBotIa7cJGy1SfbRy0=";
+    hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pygbm/default.nix
+++ b/pkgs/development/python-modules/pygbm/default.nix
@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, scipy
-, numpy
-, numba
-, scikit-learn
-, pytest
-, pythonOlder
-}:
-
-buildPythonPackage rec {
-  pname = "pygbm";
-  version = "0.1.0";
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "ogrisel";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3";
-  };
-
-  propagatedBuildInputs = [
-    scipy
-    numpy
-    numba
-    scikit-learn
-  ];
-
-  nativeCheckInputs = [
-    pytest
-  ];
-
-  checkPhase = ''
-    # numerical rounding error in test
-    pytest -k "not test_derivatives"
-  '';
-
-  meta = with lib; {
-    description = "Experimental Gradient Boosting Machines in Python";
-    homepage = "https://github.com/ogrisel/pygbm";
-    license = licenses.mit;
-    maintainers = [ maintainers.costrouc ];
-    broken = true;
-  };
-}
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@ -5,6 +5,7 @@
 , mpi4py
 , numpy
 , precice
+, pkgconfig
 , pythonOlder
 }:

@ -24,6 +25,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [
    cython
+    pkgconfig
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pytest-ordering/default.nix
+++ b/pkgs/development/python-modules/pytest-ordering/default.nix
@ -1,32 +0,0 @@
-{ lib, fetchFromGitHub, buildPythonPackage
-, pytest }:
-
-buildPythonPackage rec {
-  pname = "pytest-ordering";
-  version = "unstable-2019-06-19";
-
-  # Pypi lacks tests/
-  # Resolves PytestUnknownMarkWarning from pytest
-  src = fetchFromGitHub {
-    owner = "ftobia";
-    repo = pname;
-    rev = "492697ee26633cc31d329c1ceaa468375ee8ee9c";
-    sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn";
-  };
-
-  nativeCheckInputs = [
-    pytest
-  ];
-
-  checkPhase = ''
-    pytest tests
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/ftobia/pytest-ordering";
-    description = "Pytest plugin to run your tests in a specific order";
-    license = licenses.mit;
-    broken = true;  # See https://github.com/NixOS/nixpkgs/pull/122264
-    maintainers = with maintainers; [ eadwu ];
-  };
-}
--- a/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/pkgs/development/python-modules/pytest-sanic/default.nix
@ -1,52 +0,0 @@
-{ lib
-, aiohttp
-, async_generator
-, buildPythonPackage
-, fetchFromGitHub
-, httpx
-, pytest
-, pytestCheckHook
-, sanic
-, websockets
-}:
-
-buildPythonPackage rec {
-  pname = "pytest-sanic";
-  version = "1.9.1";
-
-  src = fetchFromGitHub {
-    owner = "yunstanford";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s=";
-  };
-
-  buildInputs = [
-    pytest
-  ];
-
-  propagatedBuildInputs = [
-    aiohttp
-    async_generator
-    httpx
-    pytest
-    websockets
-  ];
-
-  nativeCheckInputs = [
-    sanic
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [
-    "pytest_sanic"
-  ];
-
-  meta = with lib; {
-    description = "A pytest plugin for Sanic";
-    homepage = "https://github.com/yunstanford/pytest-sanic/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ costrouc ];
-    broken = true; # 2021-11-04
-  };
-}
--- a/pkgs/development/python-modules/wikipedia/default.nix
+++ b/pkgs/development/python-modules/wikipedia/default.nix
@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, beautifulsoup4
+, requests
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "wikipedia";
+  version = "1.4.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-2w+tGCn91EGxhSMG6YVjmCBNwHhtKZbdLgyLuOJhM7I=";
+  };
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    requests
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  unittestFlagsArray = [
+    "tests/ '*test.py'"
+  ];
+
+  meta = with lib; {
+    description = "A Pythonic wrapper for the Wikipedia API";
+    homepage = "https://github.com/goldsmith/Wikipedia";
+    changelog = "https://github.com/goldsmith/Wikipedia/blob/master/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/tools/bearer/default.nix
+++ b/pkgs/development/tools/bearer/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "bearer";
-  version = "1.11.0";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "bearer";
    repo = "bearer";
    rev = "refs/tags/v${version}";
-    hash = "sha256-JbxITOF+6LxITA1Ujy9ZbCO9vSym/qfbEascKDvogJk=";
+    hash = "sha256-7h+7lP4K4Dbf5V2HDrb2lJKWqINtOpqybBAyae0S6EE=";
  };

-  vendorHash = "sha256-MKfD6RBMaCxB09SX0FlH+mJnzXyw2KkkOnVvBTMdb/w=";
+  vendorHash = "sha256-D8LdufbOx3ogLbeSwBTsDnQ4NpZF+Ro2QiUg4hPGGYI=";

  subPackages = [
    "cmd/bearer"
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "17.4.0";
+  version = "17.5.2";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-dcQj9VPHPMg6Ht6EBz4nCv76xcQ7xqxvDH/KfFPQsqU=";
+    hash = "sha256-WNB4NzOvabShVHivDs027y6QmU71GMrYJehCB9jPlA8=";
  };

-  vendorHash = "sha256-tEOEFCKR4qqqnyfpAEMw5WQdOok4SFZAqsMc1+H5CCU=";
+  vendorHash = "sha256-fHwaCcN47+LkJYqRFSQgVddVuR1QfdFuSNDYFh1edM4=";

  sourceRoot = "source/src";

--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@ -72,7 +72,8 @@ let
        { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } //
        { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; } //
        { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } //
-        { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; };
+        { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } //
+        { tree-sitter-wing = grammars'.tree-sitter-wing // { location = "libs/tree-sitter-wing"; generate = true; }; };
    in
    lib.mapAttrs build (grammars);

--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@ -96,6 +96,7 @@
  tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json;
  tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json;
  tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json;
+  tree-sitter-wing = lib.importJSON ./tree-sitter-wing.json;
  tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json;
  tree-sitter-yang = lib.importJSON ./tree-sitter-yang.json;
  tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json;
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/winglang/wing",
+  "rev": "e578973d6f60091ba3458095edceb37bae2d04e2",
+  "date": "2023-06-27T12:28:26+00:00",
+  "path": "/nix/store/ppjabjz0dgmsr3k0wm07z7391vz7m120-wing",
+  "sha256": "0089rxdzxi43qal2310dpyzw1a3zl08qbm5b8md8cgwmvycija9a",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@ -371,6 +371,10 @@ let
      orga = "eonpatapon";
      repo = "tree-sitter-cue";
    };
+    "tree-sitter-wing" = {
+      orga = "winglang";
+      repo = "wing";
+    };
  };

  allGrammars =
--- a/pkgs/development/tools/rust/cargo-binstall/default.nix
+++ b/pkgs/development/tools/rust/cargo-binstall/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-binstall";
-  version = "0.23.1";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "cargo-bins";
    repo = "cargo-binstall";
    rev = "v${version}";
-    hash = "sha256-Dpo/J6FTW95rODWeIqD+8YnN4dt5yhLPxoezA1CTM4A=";
+    hash = "sha256-43AXxTuHwaNLDTDmLps/HbRvQFWyUgLQhTrxHtQCk3k=";
  };

-  cargoHash = "sha256-Nc/kdrLsAooM41pwlkZ3zWsLvFlnxHG/2ZQhPsEyPkI=";
+  cargoHash = "sha256-F26wjIsBjQ+z+sHGzE7PdYOZi7XwStlOXfbK/lpepDY=";

  nativeBuildInputs = [
    pkg-config
@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
  buildNoDefaultFeatures = true;
  buildFeatures = [
    "fancy-no-backtrace"
+    "git"
    "pkg-config"
    "rustls"
    "trust-dns"
@ -53,11 +54,6 @@ rustPlatform.buildRustPackage rec {
    "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1"
  ];

-  # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
-  postPatch = ''
-    rm .cargo/config
-  '';
-
  meta = with lib; {
    description = "A tool for installing rust binaries as an alternative to building from source";
    homepage = "https://github.com/cargo-bins/cargo-binstall";
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@ -2,16 +2,16 @@

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

  src = fetchFromGitHub {
    owner = "mozilla";
    repo = pname;
    rev = version;
-    sha256 = "sha256-URTWfV/weXWvgaZv7RWKqr7w3dnad2Pr5wNv0rcm2eg=";
+    sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ=";
  };

-  cargoSha256 = "sha256-cnxVcq5v6MXH7hrdT4kE+8DxJY5z2fGCF3G6GGJx8pw=";
+  cargoSha256 = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso=";

  buildInputs = lib.optional stdenv.isDarwin Security;

--- a/pkgs/development/tools/sq/default.nix
+++ b/pkgs/development/tools/sq/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "sq";
-  version = "0.38.0";
+  version = "0.39.1";

  src = fetchFromGitHub {
    owner = "neilotoole";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-h8rCHtBTckLjRxi79N26pYiCJSI/UKUbwUTsQXD7Sco=";
+    sha256 = "sha256-Icx7IhMRbud2gCyMvjuYM9CipzAH39X+bC4AEwVheVQ=";
  };

-  vendorHash = "sha256-VcqCscheXYgWT88ZExJWdwRMT5Ir0C49S5+Hp557jiw=";
+  vendorHash = "sha256-xaUjkUWmYfvYGgWgKiMhgi50ws0VhNNqzBwQ2WzDkas=";

  proxyVendor = true;

--- a/pkgs/development/tools/xcodes/default.nix
+++ b/pkgs/development/tools/xcodes/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xcodes";
-  version = "1.3.0";
+  version = "1.4.1";

  src = fetchurl {
    url = "https://github.com/XcodesOrg/xcodes/releases/download/${finalAttrs.version}/xcodes.zip";
-    hash = "sha256:0cqb0gfb80xrnm4fipr46kbzqz2kicc13afhdxkbifzm4k83any5";
+    hash = "sha256-PtXF2eqNfEX29EtXlcjdxrUs7BPn/YurUuFFeLpXwrk=";
  };

  nativeBuildInputs = [ unzip ];
@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
  dontFixup = true;

  meta = with lib; {
+    changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}";
    description = "Command-line tool to install and switch between multiple versions of Xcode";
    homepage = "https://github.com/XcodesOrg/xcodes";
    license = licenses.mit;
--- a/pkgs/games/rare/default.nix
+++ b/pkgs/games/rare/default.nix
@ -13,13 +13,13 @@

 buildPythonApplication rec {
  pname = "rare";
-  version = "1.9.4";
+  version = "1.10.3";

  src = fetchFromGitHub {
    owner = "Dummerle";
    repo = "Rare";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-+STwVsDdvjP7HaqmaQVug+6h0n0rw/j4LGQQSNdLVQQ=";
+    hash = "sha256-7KER9gCpqjEKikQTVHsvwX6efCb9L0ut6OBjjLBW2tI=";
  };

  nativeBuildInputs = [
@ -36,7 +36,6 @@ buildPythonApplication rec {
  ];

  patches = [
-    ./fix-instance.patch
    # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342
    ./legendary-gl-version.patch
  ];
--- a/pkgs/games/rare/fix-instance.patch
+++ b/pkgs/games/rare/fix-instance.patch
@ -1,10 +0,0 @@
-diff --git a/rare/utils/misc.py b/rare/utils/misc.py
-index 4492074..5352dac 100644
--- a/rare/utils/misc.py
-+++ b/rare/utils/misc.py
-@@ -190,6 +190,7 @@ def get_rare_executable() -> List[str]:
-         executable = [sys.executable]
- 
-     executable[0] = os.path.abspath(executable[0])
-+    executable.pop(0)
-     return executable
--- a/pkgs/games/rare/legendary-gl-version.patch
+++ b/pkgs/games/rare/legendary-gl-version.patch
@ -6,8 +6,8 @@ index 2416360..08de818 100644
 
 requirements = [
     "requests<3.0",
-    "legendary-gl==0.20.31",
-+    "legendary-gl~=0.20.31",
+-    "legendary-gl==0.20.32",
+    "legendary-gl~=0.20.32",
     "setuptools",
     "wheel",
     "PyQt5",
--- a/pkgs/misc/lssecret/default.nix
+++ b/pkgs/misc/lssecret/default.nix
@ -0,0 +1,31 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, pkg-config
+, libsecret
+}:
+
+stdenv.mkDerivation rec {
+  name = "lssecret";
+  version = "unstable-2022-12-02";
+
+  src = fetchFromGitLab {
+    owner = "GrantMoyer";
+    repo = name;
+    rev = "20fd771a";
+    hash = "sha256-yU70WZj4EC/sFJxyq2SQ0YQ6RCQHYiW/aQiYWo7+ujk=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libsecret ];
+
+  makeFlags = ["DESTDIR=$(out)"];
+
+  meta = {
+    description = "A tool to list passwords and other secrets stored using the org.freedesktop.secrets dbus api";
+    homepage = "https://gitlab.com/GrantMoyer/lssecret";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ genericnerdyusername ];
+    platforms = lib.platforms.unix;
+  };
+}
--- a/pkgs/tools/games/trigger-control/default.nix
+++ b/pkgs/tools/games/trigger-control/default.nix
@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/Etaash-mathamsetty/trigger-control";
    license = licenses.mit;
    maintainers = with maintainers; [ azuwis ];
+    platforms = platforms.all;
  };
 }
--- a/pkgs/tools/misc/hashpump/default.nix
+++ b/pkgs/tools/misc/hashpump/default.nix
@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, openssl, lib }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hashpump";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "bwall";
+    repo = "HashPump";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-xL/1os17agwFtdq0snS3ZJzwJhk22ujxfWLH65IMMEM=";
+  };
+
+  makeFlags = [ "INSTALLLOCATION=${placeholder "out"}/bin/" ];
+
+  buildInputs = [ openssl ];
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    ./hashpump --test
+    runHook postCheck
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = {
+    description = "A tool to exploit the hash length extension attack in various hashing algorithms";
+    homepage = "https://github.com/bwall/HashPump";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ t4ccer ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/tools/misc/shopware-cli/default.nix
+++ b/pkgs/tools/misc/shopware-cli/default.nix
@ -8,17 +8,17 @@

 buildGoModule rec {
  pname = "shopware-cli";
-  version = "0.2.0";
+  version = "0.2.1";
  src = fetchFromGitHub {
    repo = "shopware-cli";
    owner = "FriendsOfShopware";
    rev = version;
-    hash = "sha256-IWp4cgZd6td2hOMd2r4v3MI5kY1PqLhLGAIJ3VLvgEA=";
+    hash = "sha256-3upZmqsKCg98j/HTwFp0L7MMspCw7Dj6dRoyEPW287k=";
  };

  nativeBuildInputs = [ installShellFiles makeWrapper ];

-  vendorHash = "sha256-JTjz39zw5Il37V6V7mOQuCYiPJnnizBhkBHBAg2DvSU=";
+  vendorHash = "sha256-KEWACwZka4WMQS4/O6WkIdeeUnxtcpEwQmMlNBLUjbI=";

  postInstall = ''
    export HOME="$(mktemp -d)"
--- a/pkgs/tools/networking/ooniprobe-cli/default.nix
+++ b/pkgs/tools/networking/ooniprobe-cli/default.nix
@ -5,19 +5,21 @@

 buildGoModule rec {
  pname = "ooniprobe-cli";
-  version = "3.17.5";
+  version = "3.18.0";

  src = fetchFromGitHub {
    owner = "ooni";
    repo = "probe-cli";
    rev = "v${version}";
-    hash = "sha256-pzNcyioicAOCAWaEo30T/Dr74sJ1kXvJN0pnuA2JJ7k=";
+    hash = "sha256-3KnPqUB9vNxIWF28BGZqqg1IwglHOP2qAZfDMaNcN7s=";
  };

-  vendorHash = "sha256-e8FI678zr6EWKd+rOvPOyq20PJyaXszzcooDFuGWfOU=";
+  vendorHash = "sha256-iMEmTip9c7ySFUxcKr8ZUuREw7FfBvsIhECvmagvVL0=";

  subPackages = [ "cmd/ooniprobe" ];

+  ldflags = [ "-s" "-w" ];
+
  meta = with lib; {
    changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}";
    description = "The Open Observatory of Network Interference command line network probe";
--- a/pkgs/tools/package-management/fortran-fpm/default.nix
+++ b/pkgs/tools/package-management/fortran-fpm/default.nix
@ -0,0 +1,48 @@
+{ lib
+, fetchurl
+, pkgs
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "fortran-fpm";
+
+  version = "0.9.0";
+
+  src = fetchurl {
+    url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90";
+    sha256 = "sha256-VWs4g7odtv1iyZunFD8el+u0CXKcQgnwOqPG/JcMzj8=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = with pkgs; [ gfortran ];
+
+  buildPath = "build/bootstrap";
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir -p ${buildPath}
+    gfortran -J ${buildPath} -o ${buildPath}/${pname} $src
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp ${buildPath}/${pname} $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Fortran Package Manager (fpm)";
+    homepage = "https://fpm.fortran-lang.org";
+    maintainers = [ maintainers.proofconstruction ];
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "gotrue";
-  version = "2.74.2";
+  version = "2.76.0";

  src = fetchFromGitHub {
    owner = "supabase";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-cTRCwWbGqiN6qy2Nh9Hs6Ex928z1r1ud5dGNJLZDLAA=";
+    hash = "sha256-2hhO/8PvrRoz2RoctoJdCMWn+DdBEni+AyoxkXLbgp0=";
  };

  vendorHash = "sha256-uLcea5tLe61oAyw09PpIfgf1xbClgqZYlk6553Vsvso=";
--- a/pkgs/tools/security/rnp/default.nix
+++ b/pkgs/tools/security/rnp/default.nix
@ -10,21 +10,24 @@
 , json_c
 , pkg-config
 , python3
+, sexp
 , zlib
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "rnp";
-  version = "0.16.3";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "rnpgp";
    repo = "rnp";
-    rev = "v${version}";
-    sha256 = "sha256-kM3gBc5rbLJU7UXvWz4a9c+Ahi/d0z8R9S5t0B9Fts0=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0=";
  };

-  buildInputs = [ zlib bzip2 json_c botan2 ];
+  buildInputs = [ zlib bzip2 json_c botan2 sexp ];
+
+  patches = [ ./unbundle-sexp.patch ];

  cmakeFlags = [
    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
@ -43,7 +46,7 @@ stdenv.mkDerivation rec {
  outputs = [ "out" "lib" "dev" ];

  preConfigure = ''
-    echo "v${version}" > version.txt
+    echo "v${finalAttrs.version}" > version.txt
  '';

  meta = with lib; {
@ -53,4 +56,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.all;
    maintainers = with maintainers; [ ribose-jeffreylau ];
  };
-}
+})
--- a/pkgs/tools/security/rnp/unbundle-sexp.patch
+++ b/pkgs/tools/security/rnp/unbundle-sexp.patch
@ -0,0 +1,38 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index bb6d40cb..30171e7c 100644
+--- i/CMakeLists.txt
+++ w/CMakeLists.txt
+@@ -176,11 +176,6 @@ if (ENABLE_FUZZERS)
+ endif()
+ add_subdirectory(src/common)
+
+-set(WITH_SEXP_CLI OFF)
+-set(WITH_SEXP_TESTS OFF)
+-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development)
+-add_subdirectory(src/libsexp EXCLUDE_FROM_ALL)
+-
+ add_subdirectory(src/lib)
+ add_subdirectory(src/rnp)
+ add_subdirectory(src/rnpkeys)
+diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt
+index 086ac57d..b219ef06 100755
+--- i/src/lib/CMakeLists.txt
+++ w/src/lib/CMakeLists.txt
+@@ -433,7 +433,7 @@ install(TARGETS librnp
+       COMPONENT development
+   )
+
+-  install(TARGETS librnp-static sexp
+  install(TARGETS librnp-static
+     EXPORT rnp-targets
+     ARCHIVE
+       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
+@@ -441,7 +441,7 @@ install(TARGETS librnp
+   )
+ else(BUILD_SHARED_LIBS)
+ # static libraries only
+-install(TARGETS librnp sexp
+install(TARGETS librnp
+     EXPORT rnp-targets
+     ARCHIVE
+       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
--- a/pkgs/tools/text/asciigraph/default.nix
+++ b/pkgs/tools/text/asciigraph/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "asciigraph";
-  version = "0.5.5";
+  version = "0.5.6";

  src = fetchFromGitHub {
    owner = "guptarohit";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-7sobelRCDY8mC5FYyGZmNsvUsEMxRulqPnUucNRN5J8=";
+    sha256 = "sha256-ZmH0+UXPUyO90ZI6YsKiTd6Nf8dgZAgm7Qx8PVUkHAU=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  ldflags = [ "-s" "-w" ];

--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@ -16,14 +16,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "cloud-init";
-  version = "23.2";
+  version = "23.2.1";
  namePrefix = "";

  src = fetchFromGitHub {
    owner = "canonical";
    repo = "cloud-init";
    rev = "refs/tags/${version}";
-    hash = "sha256-/bhezXS5GunlgID7e/QaTC4UsQ2hDvS5HnG8Wphk64k=";
+    hash = "sha256-2e05ExF6JOeFR0BUd/iCIYV0XoKTgoI7xz20GQ/bmO4=";
  };

  patches = [
@ -127,6 +127,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    homepage = "https://github.com/canonical/cloud-init";
    description = "Provides configuration and customization of cloud instance";
+    changelog = "https://github.com/canonical/cloud-init/raw/${version}/ChangeLog";
    license = with licenses; [ asl20 gpl3Plus ];
    maintainers = with maintainers; [ illustris jfroche ];
    platforms = platforms.all;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2065,6 +2065,8 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

+  git-graph = callPackage ../applications/version-management/git-graph { };
+
  git-hound = callPackage ../applications/version-management/git-hound { };

  git-hub = callPackage ../applications/version-management/git-hub { };
@ -5521,6 +5523,8 @@ with pkgs;

  long-shebang = callPackage ../misc/long-shebang { };

+  lssecret = callPackage ../misc/lssecret {};
+
  lowdown = callPackage ../tools/typesetting/lowdown { };

  numatop = callPackage ../os-specific/linux/numatop { };
@ -7836,6 +7840,8 @@ with pkgs;

  forktty = callPackage ../os-specific/linux/forktty { };

+  fortran-fpm = callPackage ../tools/package-management/fortran-fpm { };
+
  fortune = callPackage ../tools/misc/fortune { };

  fox = callPackage ../development/libraries/fox {
@ -10951,9 +10957,7 @@ with pkgs;

  onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };

-  ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli {
-    buildGoModule = buildGo119Module; # go 1.20 build failure
-  };
+  ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { };

  openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
  openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
@ -11656,6 +11660,8 @@ with pkgs;

  profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };

+  projectable = callPackage ../applications/file-managers/projectable { };
+
  projectlibre = callPackage ../applications/misc/projectlibre {
    jre = jre8;
    jdk = jdk8;
@ -29787,6 +29793,8 @@ with pkgs;

  cheesecutter = callPackage ../applications/audio/cheesecutter { };

+  cutecapture = callPackage ../applications/video/cutecapture { };
+
  milkytracker = callPackage ../applications/audio/milkytracker { };

  ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { };
@ -39451,6 +39459,8 @@ with pkgs;

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

+  hashpump = callPackage ../tools/misc/hashpump { };
+
  hck = callPackage ../tools/text/hck { };

  helm = callPackage ../applications/audio/helm { };
@ -39831,7 +39841,7 @@ with pkgs;

  alejandra = callPackage ../tools/nix/alejandra { };

-  nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt;
+  nixfmt = haskellPackages.nixfmt.bin;

  nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };

@ -41106,4 +41116,6 @@ with pkgs;
  reindeer = callPackage ../development/tools/reindeer { };

  charasay = callPackage ../tools/misc/charasay { };
+
+  waylyrics = callPackage ../applications/audio/waylyrics { };
 }
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -28,7 +28,6 @@ let
    "ghc945"
    "ghc94"
    "ghc96"
-    "ghc961"
    "ghc962"
    "ghcHEAD"
  ];
@ -48,7 +47,6 @@ let
    "ghc944"
    "ghc945"
    "ghc96"
-    "ghc961"
    "ghc962"
    "ghcHEAD"
  ];
@ -350,26 +348,6 @@ in {
      llvmPackages = pkgs.llvmPackages_12;
    };
    ghc94 = ghc945;
-    ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix {
-      bootPkgs =
-        # For GHC 9.2 no armv7l bindists are available.
-        if stdenv.hostPlatform.isAarch32 then
-          packages.ghc924
-        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
-          packages.ghc924
-        else if stdenv.isAarch64 then
-          packages.ghc924BinaryMinimal
-        else
-          packages.ghc924Binary;
-      inherit (buildPackages.python3Packages) sphinx;
-      # Need to use apple's patched xattr until
-      # https://github.com/xattr/xattr/issues/44 and
-      # https://github.com/xattr/xattr/issues/55 are solved.
-      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-      # Support range >= 10 && < 15
-      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
-      llvmPackages = pkgs.llvmPackages_14;
-    };
    ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix {
      bootPkgs =
        # For GHC 9.2 no armv7l bindists are available.
@ -553,11 +531,6 @@ in {
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
    };
    ghc94 = ghc945;
-    ghc961 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc961;
-      ghc = bh.compiler.ghc961;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
-    };
    ghc962 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc962;
      ghc = bh.compiler.ghc962;
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -211,6 +211,7 @@ mapAliases ({
  pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
  pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
  pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
+  pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20
  PyGithub = pygithub; # added 2023-02-19
  pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
  pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
@ -250,9 +251,11 @@ mapAliases ({
  PyStemmer = pystemmer; # added 2023-02-19
  pytest_6 = pytest; # added 2022-02-10
  pytestcov = pytest-cov; # added 2021-01-04
+  pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22
  pytest-pep8 = pytestpep8; # added 2021-01-04
  pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12
  pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09
+  pytest-sanic = throw "pytest-sanic has been removed because it is unmaintained and broken"; # added 2023-06-22
  pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
  pytestquickcheck = pytest-quickcheck; # added 2021-07-20
  pytestrunner = pytest-runner; # added 2021-01-04
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1326,6 +1326,8 @@ self: super: with self; {

  binwalk-full = self.binwalk.override { visualizationSupport = true; };

+  biopandas = callPackage ../development/python-modules/biopandas { };
+
  biopython = callPackage ../development/python-modules/biopython { };

  biplist = callPackage ../development/python-modules/biplist { };
@ -1861,6 +1863,10 @@ self: super: with self; {

  ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };

+  clarifai = callPackage ../development/python-modules/clarifai { };
+
+  clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { };
+
  claripy = callPackage ../development/python-modules/claripy { };

  classify-imports = callPackage ../development/python-modules/classify-imports { };
@ -6113,6 +6119,8 @@ self: super: with self; {

  marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { };

+  mashumaro = callPackage ../development/python-modules/mashumaro { };
+
  mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };

  masky = callPackage ../development/python-modules/masky { };
@ -6393,6 +6401,8 @@ self: super: with self; {

  mmpython = callPackage ../development/python-modules/mmpython { };

+  mmtf-python = callPackage ../development/python-modules/mmtf-python { };
+
  mnemonic = callPackage ../development/python-modules/mnemonic { };

  mne-python = callPackage ../development/python-modules/mne-python { };
@ -8692,8 +8702,6 @@ self: super: with self; {

  pygatt = callPackage ../development/python-modules/pygatt { };

-  pygbm = callPackage ../development/python-modules/pygbm { };
-
  pygccxml = callPackage ../development/python-modules/pygccxml { };

  pygdbmi = callPackage ../development/python-modules/pygdbmi { };
@ -9741,8 +9749,6 @@ self: super: with self; {

  pytest-order = callPackage ../development/python-modules/pytest-order { };

-  pytest-ordering = callPackage ../development/python-modules/pytest-ordering { };
-
  pytest-param-files = callPackage ../development/python-modules/pytest-param-files { };

  pytest-playwright = callPackage ../development/python-modules/pytest-playwright {};
@ -9783,10 +9789,6 @@ self: super: with self; {

  pytest-runner = callPackage ../development/python-modules/pytest-runner { };

-  pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
-    sanic = self.sanic.override { doCheck = false; };
-  };
-
  pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };

  pytest-services = callPackage ../development/python-modules/pytest-services { };
@ -13215,6 +13217,8 @@ self: super: with self; {

  wifi = callPackage ../development/python-modules/wifi { };

+  wikipedia = callPackage ../development/python-modules/wikipedia { };
+
  willow = callPackage ../development/python-modules/willow { };

  winacl = callPackage ../development/python-modules/winacl { };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -69,7 +69,6 @@ let
    ghc927
    ghc928
    ghc945
-    ghc961
    ghc962
  ];

@ -487,15 +486,12 @@ let
      Cabal_3_10_1_0 = released;
      Cabal-syntax_3_10_1_0 = released;
      cabal2nix = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      cabal2nix-unstable = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      funcmp = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      haskell-language-server = lib.subtractLists [
@ -503,21 +499,17 @@ let
        compilerNames.ghc884
      ] released;
      hoogle = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      hlint = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      hpack = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      hsdns = released;
      jailbreak-cabal = released;
      language-nix = lib.subtractLists [
-        compilerNames.ghc961
        compilerNames.ghc962
      ] released;
      nix-paths = released;