Merge staging-next into staging

2023-06-07 12:01:38 +00:00 · 2023-06-07 12:01:38 +00:00 · 4715513f7b
commit 4715513f7b
parent 03925ecb5f 4eade558e5
60 changed files with 1349 additions and 1443 deletions
--- a/doc/builders/fetchers.chapter.md
+++ b/doc/builders/fetchers.chapter.md
@ -132,11 +132,16 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m

 `fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `hash` is currently preferred.

+To use a different GitHub instance, use `githubBase` (defaults to `"github.com"`).
+
 `fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.

 ## `fetchFromGitLab` {#fetchfromgitlab}

-This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.
+This is used with GitLab repositories. It behaves similarly to `fetchFromGitHub`, and expects `owner`, `repo`, `rev`, and `hash`.
+
+To use a specific GitLab instance, use `domain` (defaults to `"gitlab.com"`).
+

 ## `fetchFromGitiles` {#fetchfromgitiles}

@ -144,7 +149,7 @@ This is used with Gitiles repositories. The arguments expected are similar to `f

 ## `fetchFromBitbucket` {#fetchfrombitbucket}

-This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above.
+This is used with BitBucket repositories. The arguments expected are very similar to `fetchFromGitHub` above.

 ## `fetchFromSavannah` {#fetchfromsavannah}

--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@ -43,7 +43,7 @@ in {

    sizeMB = mkOption {
      type = with types; either (enum [ "auto" ]) int;
-      default = 2048;
+      default = 3072;
      example = 8192;
      description = lib.mdDoc "The size in MB of the image";
    };
--- a/nixos/modules/hardware/i2c.nix
+++ b/nixos/modules/hardware/i2c.nix
@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:

 with lib;

@ -31,10 +31,14 @@ in
      i2c = { };
    };

-    services.udev.extraRules = ''
-      # allow group ${cfg.group} and users with a seat use of i2c devices
-      ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660"
-    '';
+    services.udev.packages = lib.singleton (pkgs.writeTextFile
+      { name = "i2c-udev-rules";
+        text = ''
+          # allow group ${cfg.group} and users with a seat use of i2c devices
+          ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660"
+        '';
+        destination = "/etc/udev/rules.d/70-i2c.rules";
+      });

  };

--- a/nixos/modules/services/misc/atuin.nix
+++ b/nixos/modules/services/misc/atuin.nix
@ -46,6 +46,13 @@ in
        description = mdDoc "Open ports in the firewall for the atuin server.";
      };

+      database = {
+        createLocally = mkOption {
+          type = types.bool;
+          default = true;
+          description = lib.mdDoc "Create the database and database user locally.";
+        };
+      };
    };
  };

@ -65,7 +72,8 @@ in

    systemd.services.atuin = {
      description = "atuin server";
-      after = [ "network.target" "postgresql.service" ];
+      requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+      after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ;
      wantedBy = [ "multi-user.target" ];

      serviceConfig = {
@ -80,7 +88,7 @@ in
        ATUIN_PORT = toString cfg.port;
        ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
        ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration;
-        ATUIN_DB_URI = "postgresql:///atuin";
+        ATUIN_DB_URI =  mkIf cfg.database.createLocally "postgresql:///atuin";
        ATUIN_PATH = cfg.path;
        ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
      };
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@ -713,7 +713,7 @@ in
          Configuration lines appended to the generated Nginx
          configuration file. Commonly used by different modules
          providing http snippets. {option}`appendConfig`
-          can be specified more than once and it's value will be
+          can be specified more than once and its value will be
          concatenated (contrary to {option}`config` which
          can be set only once).
        '';
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@ -1,20 +0,0 @@
-diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index a8e6261..2b008fc 100644
--- a/runtime/filetype.vim
-+++ b/runtime/filetype.vim
-@@ -2258,6 +2258,9 @@ au BufNewFile,BufRead *.zsql			call s:SQL()
- " Z80 assembler asz80
- au BufNewFile,BufRead *.z8a			setf z8a
- 
-+" Nix
-+au BufNewFile,BufRead *.nix		setf nix
-+
- augroup END
- 
- 
-@@ -2440,3 +2443,5 @@ endfunc
- " Restore 'cpoptions'
- let &cpo = s:cpo_save
- unlet s:cpo_save
-+
-+
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@ -24,7 +24,7 @@
 , netbeansSupport   ? config.netbeans or true       # Enable NetBeans integration support.
 , ximSupport        ? config.vim.xim or true        # less than 15KB, needed for deadkeys
 , darwinSupport     ? config.vim.darwin or false    # Enable Darwin support
-, ftNixSupport      ? config.vim.ftNix or true      # Add .nix filetype detection and minimal syntax highlighting support
+, ftNixSupport      ? config.vim.ftNix or true      # Add nix indentation support from vim-nix (not needed for basic syntax highlighting)
 }:


@ -61,7 +61,7 @@ let

  common = callPackage ./common.nix {};

-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {

  pname = "vim-full";

@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
    default = common.src; # latest release
  };

-  patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
+  patches = [ ./cflags-prune.diff ];

  configureFlags = [
    "--with-features=${features}"
@ -163,10 +163,9 @@ in stdenv.mkDerivation rec {
  # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";

-  preConfigure = "" + lib.optionalString ftNixSupport ''
+  preConfigure = lib.optionalString ftNixSupport ''
      cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
      cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
-      cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
    '';

  preInstall = ''
--- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
@ -25,7 +25,7 @@
 }:
 let
  mutableExtensionsFilePath = toString mutableExtensionsFile;
-  mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath);
+  mutableExtensions = lib.optionals (builtins.pathExists mutableExtensionsFile) (import mutableExtensionsFilePath);
  vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
    inherit lib writeShellScriptBin extensionsFromVscodeMarketplace;
    vscodeDefault = vscode;
--- a/pkgs/applications/misc/shavee/default.nix
+++ b/pkgs/applications/misc/shavee/default.nix
@ -1,4 +1,12 @@
-{ lib, pkgs, rustPlatform, fetchFromGitHub, pkg-config, openssl, zlib,stdenv, pam }:
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, pam
+, pkg-config
+, openssl
+, zlib
+}:

 rustPlatform.buildRustPackage rec {
  pname = "shavee";
@ -8,10 +16,10 @@ rustPlatform.buildRustPackage rec {
    owner = "ashuio";
    repo = "shavee";
    rev = "v${version}";
-    sha256 = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
+    hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
  };

-  cargoSha256 = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU=";
+  cargoHash = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU=";

  nativeBuildInputs = [
    pkg-config
@ -19,8 +27,8 @@ rustPlatform.buildRustPackage rec {

  buildInputs = [
    openssl
-    zlib
    pam
+    zlib
  ];

   # these tests require network access
@ -29,11 +37,11 @@ rustPlatform.buildRustPackage rec {
    "--skip=filehash::tests::get_filehash_unit_test"
  ];

-  meta = with lib; {
-    description = "A Program to automatically decrypt and mount ZFS datasets using Yubikey HMAC as 2FA or any File on USB/SFTP/HTTPS.";
+  meta = {
    homepage = "https://github.com/ashuio/shavee";
-    license = licenses.mit;
-    maintainers = with maintainers; [jasonodoom];
-    platforms = platforms.linux;
+    description = "A program to automatically decrypt and mount ZFS datasets using Yubikey HMAC as 2FA or any File on USB/SFTP/HTTPS";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jasonodoom ];
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/applications/misc/slic3r/boost-compile-error.patch
+++ b/pkgs/applications/misc/slic3r/boost-compile-error.patch
@ -1,12 +0,0 @@
-diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
-index cc0b2983..0f39f5a3 100644
--- a/xs/src/libslic3r/GCodeSender.hpp
-+++ b/xs/src/libslic3r/GCodeSender.hpp
-@@ -9,6 +9,7 @@
- #include <boost/asio.hpp>
- #include <boost/bind.hpp>
- #include <boost/thread.hpp>
-+#include <boost/core/noncopyable.hpp>
- 
- namespace Slic3r {
- 
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, perl, makeWrapper
+{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper
 , makeDesktopItem, which, perlPackages, boost, wrapGAppsHook
 }:

@ -42,10 +42,20 @@ stdenv.mkDerivation rec {
    sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
  '';

-  # note the boost-compile-error is fixed in
-  # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68
-  # this patch can be probably be removed in the next version after 1.3.0
-  patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch;
+  patches = [
+    (fetchpatch {
+      url = "https://web.archive.org/web/20230606220657if_/https://sources.debian.org/data/main/s/slic3r/1.3.0%2Bdfsg1-5/debian/patches/Drop-error-admesh-works-correctly-on-little-endian-machin.patch";
+      hash = "sha256-+F94jzMFBdI++SKgyEZTBaHFVbjxWwgJa8YVbpK0euI=";
+    })
+    (fetchpatch {
+      url = "https://web.archive.org/web/20230606220036if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch";
+      hash = "sha256-4jvNccttig5YI1hXSANAWxVz6C4+kowlacMXVCpFgOo=";
+    })
+    (fetchpatch {
+      url = "https://web.archive.org/web/20230606220054if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/fix_boost_174.patch";
+      hash = "sha256-aSmxc2htmrla9l/DIRWeKdBW0LTV96wMUZSLLNjgbzY=";
+    })
+  ];

  buildPhase = ''
    export SLIC3R_NO_AUTO=true
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@ -3,7 +3,7 @@
 , pkg-config
 , fetchpatch
 , scons
-, boost172
+, boost
 , dvdauthor
 , dvdplusrwtools
 , enca
@ -22,7 +22,7 @@ let
  fetchPatchFromAur = {name, sha256}:
    fetchpatch {
      inherit name sha256;
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=766dd4ba1715fc921fe26ce1bdcf22c30f4fc073";
    };
 in
 stdenv.mkDerivation rec {
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
    {name="fix_throw_specifications.patch";   sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";}
    {name="fix_operator_ambiguity.patch";     sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";}
    {name="fix_ffmpeg30.patch";               sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";}
+    {name="inc_boost_header.patch";           sha256="sha256-76vjkf62VsNJ5FmBEs+X7ZBqjvJ372mjSIreBxNQym8=";}
  ]);

  postPatch = ''
@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ];

  buildInputs = [
-    boost172
+    boost
    dvdauthor
    dvdplusrwtools
    enca
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99.tar.gz",
-  "sha256": "034hmgc16mn9ly7pc6d67ksv9qdpmrv7va8jwpnjsd2mf1fc9gwz",
-  "msg": "Update from Hackage at 2023-05-30T03:47:42Z"
+  "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"
 }
--- a/pkgs/development/compilers/jasmin-compiler/default.nix
+++ b/pkgs/development/compilers/jasmin-compiler/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "jasmin-compiler";
-  version = "2022.09.2";
+  version = "2022.09.3";

  src = fetchurl {
    url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
-    hash = "sha256-CGKaFR9Ax0O7BaW42DwYS4Air7zo5fOY2ExHkMGdtqo=";
+    hash = "sha256-CCLUF3GDeQrWIur1ve19WveNiOR/6kRVWuU7wvmXGGg=";
  };

  sourceRoot = "jasmin-compiler-v${version}/compiler";
--- a/pkgs/development/coq-modules/relation-algebra/default.nix
+++ b/pkgs/development/coq-modules/relation-algebra/default.nix
@ -9,6 +9,7 @@ mkCoqDerivation {
    then "v.${v}"
    else "v${v}";

+  release."1.7.9".sha256 = "sha256-1WzAZyj6q7s0u/9r7lahzxTl8612EA540l9wpm7TYEg=";
  release."1.7.8".sha256 = "sha256-RITFd3G5TjY+rFzW073Ao1AGU+u6OGQyQeGHVodAXnA=";
  release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2";
  release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w";
@ -20,6 +21,7 @@ mkCoqDerivation {

  inherit version;
  defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = isEq "8.17"; out = "1.7.9"; }
    { case = isEq "8.16"; out = "1.7.8"; }
    { case = isEq "8.15"; out = "1.7.7"; }
    { case = isEq "8.14"; out = "1.7.6"; }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -1663,6 +1663,14 @@ self: super: {
  servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;

  hercules-ci-agent = lib.pipe super.hercules-ci-agent [
+    (appendPatches [
+      # https://github.com/hercules-ci/hercules-ci-agent/pull/507
+      (fetchpatch {
+        url = "https://github.com/hercules-ci/hercules-ci-agent/commit/f5c39d0cbde36a056419cab8d69a67302eb8b0e4.patch";
+        sha256 = "sha256-J8N4+HUQ6vlJBCwCyxv8Fv5HSbtiim64Qh1n9CaRe1o=";
+        stripLen = 1;
+      })
+    ])
    (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
  ];

--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -78,6 +78,10 @@ self: super: {
  # https://github.com/sjakobi/bsb-http-chunked/issues/38
  bsb-http-chunked = dontCheck super.bsb-http-chunked;

+  # https://github.com/NixOS/cabal2nix/issues/554
+  # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility
+  clash-prelude = dontDistribute (markBroken super.clash-prelude);
+
  # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
  hiedb = dontCheck super.hiedb;

--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@ -205,11 +205,6 @@ in {
  cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo);
  pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango);

-  # The gtk2hs setup hook provided by this package lacks the ppOrdering field that
-  # recent versions of Cabal require. This leads to builds like cairo and glib
-  # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323.
-  gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools;
-
  # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
  gtk = doJailbreak super.gtk;
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -703,7 +703,6 @@ broken-packages:
  - clanki
  - clarifai
  - CLASE
-  - clash-prelude
  - Clash-Royale-Hack-Cheats
  - ClassLaws
  - classy-influxdb-simple
@ -3095,6 +3094,7 @@ broken-packages:
  - libpq
  - librandomorg
  - libsecp256k1
+  - libssh2 # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/223222399 at 2023-06-07
  - libsystemd-daemon
  - libtagc
  - libxls
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -459,6 +459,7 @@ package-maintainers:
    - calendar-recycling
    - checksum
    - check-pvp
+    - coinor-clp
    - combinatorial
    - comfort-graph
    - comfort-array
@ -490,6 +491,7 @@ package-maintainers:
    - jack
    - latex
    - lazyio
+    - linear-programming
    - markov-chain
    - midi
    - midi-alsa
@ -548,6 +550,7 @@ package-maintainers:
    - netlib-comfort-array
    - blas-comfort-array
    - lapack-comfort-array
+    - comfort-blas
    - lapack
    - lapack-hmatrix
    - hmm-lapack
@ -568,6 +571,7 @@ unsupported-platforms:
  bytelog:                                      [ platforms.darwin ] # due to posix-api
  camfort:                                      [ aarch64-linux ]
  charsetdetect:                                [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
+  Codec-Image-DevIL:                            [ platforms.darwin ] # depends on mesa
  coinor-clp:                                   [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp
  cut-the-crap:                                 [ platforms.darwin ]
  essence-of-live-coding-PortMidi:              [ platforms.darwin ]
@ -589,9 +593,12 @@ unsupported-platforms:
  gi-webkit2webextension:                       [ platforms.darwin ] # webkitgtk marked broken on darwin
  gi-webkit2:                                   [ platforms.darwin ] # webkitgtk marked broken on darwin
  gi-wnck:                                      [ platforms.darwin ]
+  gl:                                           [ platforms.darwin ] # depends on mesa
+  GLHUI:                                        [ platforms.darwin ] # depends on mesa
  gnome-keyring:                                [ platforms.darwin ]
  grid-proto:                                   [ platforms.darwin ]
  gtk-sni-tray:                                 [ platforms.darwin ]
+  h-raylib:                                     [ platforms.darwin ] # depends on mesa
  haskell-snake:                                [ platforms.darwin ]
  hb3sum:                                       [ aarch64-linux ] # depends on blake3, which is not supported on aarch64-linux
  hcwiid:                                       [ platforms.darwin ]
@ -600,6 +607,7 @@ unsupported-platforms:
  hinotify-bytestring:                          [ platforms.darwin ]
  honk:                                         [ platforms.darwin ]
  HSoM:                                         [ platforms.darwin ]
+  intricacy:                                    [ platforms.darwin ] # depends on mesa
  iwlib:                                        [ platforms.darwin ]
  Jazzkell:                                     [ platforms.darwin ] # depends on Euterpea
  jsaddle-hello:                                [ platforms.darwin ] # depends on jsaddle-webkit2gtk
@ -620,8 +628,11 @@ unsupported-platforms:
  mpi-hs-binary:                                [ aarch64-linux, platforms.darwin ]
  mpi-hs-cereal:                                [ aarch64-linux, platforms.darwin ]
  mpi-hs-store:                                 [ aarch64-linux, platforms.darwin ]
-  mplayer-spot:                                 [ aarch64-linux ]
+  mplayer-spot:                                 [ aarch64-linux, platforms.darwin ]
+  monomer:                                      [ platforms.darwin ] # depends on mesa
+  monomer-hagrid:                               [ platforms.darwin ] # depends on mesa
  mptcp-pm:                                     [ platforms.darwin ]
+  nanovg:                                       [ platforms.darwin ] # depends on mesa
  netlink:                                      [ platforms.darwin ]
  notifications-tray-icon:                      [ platforms.darwin ] # depends on gi-dbusmenu
  oculus:                                       [ platforms.darwin ]
@ -639,6 +650,8 @@ unsupported-platforms:
  reflex-localize-dom:                          [ platforms.darwin, aarch64-linux ]
  rtlsdr:                                       [ platforms.darwin ]
  rubberband:                                   [ platforms.darwin ]
+  SDL-mixer:                                    [ platforms.darwin ] # depends on mesa
+  SDL-mpeg:                                     [ platforms.darwin ] # depends on mesa
  sdl2-mixer:                                   [ platforms.darwin ]
  sdl2-ttf:                                     [ platforms.darwin ]
  sensei:                                       [ platforms.darwin ]
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -2597,6 +2597,7 @@ dont-distribute-packages:
 - libmolude
 - libraft
 - librato
+ - libssh2-conduit
 - libxml-enumerator
 - lifted-base-tf
 - lightning-haskell
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@ -7,7 +7,7 @@ let
  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
  inherit (buildPackages)
    fetchurl removeReferencesTo
-    pkg-config coreutils gnugrep gnused glibcLocales;
+    pkg-config coreutils gnugrep glibcLocales;
 in

 { pname
@ -246,11 +246,11 @@ let
    "--ghc-options=-haddock"
  ];

-  postPhases = optional doInstallIntermediates [ "installIntermediatesPhase" ];
+  postPhases = optional doInstallIntermediates "installIntermediatesPhase";

  setupCompileFlags = [
    (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
-    (optionalString enableParallelBuilding (parallelBuildingFlags))
+    (optionalString enableParallelBuilding parallelBuildingFlags)
    "-threaded"       # https://github.com/haskell/cabal/issues/2398
    "-rtsopts"        # allow us to pass RTS flags to the generated Setup executable
  ];
@ -698,7 +698,7 @@ stdenv.mkDerivation ({
          lib.optionals (!isCross) setupHaskellDepends);

        ghcCommandCaps = lib.toUpper ghcCommand';
-      in stdenv.mkDerivation ({
+      in stdenv.mkDerivation {
        inherit name shellHook;

        depsBuildBuild = lib.optional isCross ghcEnvForBuild;
@ -718,7 +718,7 @@ stdenv.mkDerivation ({
        "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
          then "${ghcEnv}/lib/HaLVM-${ghc.version}"
          else "${ghcEnv}/${ghcLibdir}";
-      });
+      };

    env = envFunc { };

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -3561,6 +3561,7 @@ self: {
       librarySystemDepends = [ libdevil ];
       description = "An FFI interface to the DevIL library";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libdevil;};

  "Color" = callPackage
@ -7019,6 +7020,7 @@ self: {
       librarySystemDepends = [ libGL libX11 ];
       description = "Open OpenGL context windows in X11 with libX11";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};

  "GLM" = callPackage
@ -18376,6 +18378,7 @@ self: {
       librarySystemDepends = [ SDL_mixer ];
       description = "Binding to libSDL_mixer";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) SDL_mixer;};

  "SDL-mpeg" = callPackage
@ -18389,6 +18392,7 @@ self: {
       librarySystemDepends = [ smpeg ];
       description = "Binding to the SMPEG library";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) smpeg;};

  "SDL-ttf" = callPackage
@ -34505,10 +34509,8 @@ self: {
     }:
     mkDerivation {
       pname = "arch-hs";
-       version = "0.11.0.0";
-       sha256 = "0zl9lsz9bhzyd4vd61q0rkawb7iyghk9cb5pzm4gm4y9d9hayw0p";
-       revision = "1";
-       editedCabalFile = "0gkbiyqjslrfa6zfik9zhf3ccrgdv9fh29rbgsl3qky8vq88dg3h";
+       version = "0.11.1.0";
+       sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -34540,10 +34542,8 @@ self: {
     }:
     mkDerivation {
       pname = "arch-web";
-       version = "0.1.1";
-       sha256 = "1qlx1md7hzxv5cxv3jsiyc0rrbrg2m38b0w27i7bdyd1dlpnyy0d";
-       revision = "1";
-       editedCabalFile = "1342nvrxz8g6q96swxvvbvs1g34s82lhrx02xq371cv70svyq2bk";
+       version = "0.2";
+       sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp";
       libraryHaskellDepends = [
         aeson base deriving-aeson exceptions http-client http-client-tls
         http-types lens mtl servant servant-client servant-client-core text
@ -37892,6 +37892,8 @@ self: {
       pname = "attoparsec-run";
       version = "0.0.2.0";
       sha256 = "0j9mj61aa4hw4j2z73fxjb1py8yhznk3irw2cqs9l40kmqlf0gz8";
+       revision = "1";
+       editedCabalFile = "1hvp37nr4pa8y3685444fhw8ah8b8bh65sbjca3cy15f99z9bbxp";
       libraryHaskellDepends = [ attoparsec base bytestring mtl text ];
       testHaskellDepends = [ attoparsec base bytestring hspec mtl text ];
       description = "Conveniently run Attoparsec parsers";
@ -40442,8 +40444,8 @@ self: {
     }:
     mkDerivation {
       pname = "balkon";
-       version = "1.0.0.1";
-       sha256 = "0w975sm45if3lwg1gfbcd6w5xamf4k3bz20anpvz3yyiknnd29p9";
+       version = "1.1.0.0";
+       sha256 = "0836mr88x8qqphv0mp9brbcggjpyz4id3z0n7rbrazg4gy343pyy";
       libraryHaskellDepends = [
         base harfbuzz-pure text text-icu unicode-data-scripts
       ];
@ -42105,6 +42107,28 @@ self: {
       license = lib.licenses.mit;
     }) {};

+  "bcp47-orphans_0_1_0_6" = callPackage
+    ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable
+     , hspec, http-api-data, path-pieces, persistent, QuickCheck
+     , serialise, text
+     }:
+     mkDerivation {
+       pname = "bcp47-orphans";
+       version = "0.1.0.6";
+       sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q";
+       libraryHaskellDepends = [
+         base bcp47 cassava errors esqueleto hashable http-api-data
+         path-pieces persistent serialise text
+       ];
+       testHaskellDepends = [
+         base bcp47 cassava hspec path-pieces persistent QuickCheck
+         serialise
+       ];
+       description = "BCP47 orphan instances";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "bcrypt" = callPackage
    ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
     mkDerivation {
@ -48332,12 +48356,18 @@ self: {
     }) {};

  "bookhound" = callPackage
-    ({ mkDerivation, base, containers, text, time }:
+    ({ mkDerivation, base, containers, hspec, hspec-discover
+     , QuickCheck, quickcheck-instances, text, time
+     }:
     mkDerivation {
       pname = "bookhound";
-       version = "0.1.24.0";
-       sha256 = "1kyd574wyzgywsl5j6l6ji5vf3y82zf03qmawymjy5l0m6sg0gin";
+       version = "0.1.25.0";
+       sha256 = "0kdsr01iwnf9jzb4sfh7mcsnffzxmvfiziz5h2214py8ya3rbi5c";
       libraryHaskellDepends = [ base containers text time ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck quickcheck-instances text time
+       ];
+       testToolDepends = [ hspec-discover ];
       description = "Simple Parser Combinators";
       license = "LGPL";
       hydraPlatforms = lib.platforms.none;
@ -53426,6 +53456,8 @@ self: {
       pname = "cabal-install-solver";
       version = "3.10.1.0";
       sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c";
+       revision = "1";
+       editedCabalFile = "1l3qhaiv0m2xc5vscggd2drinam1k4x0l3vfvvz15xrpvxypdv4d";
       libraryHaskellDepends = [
         array base bytestring Cabal Cabal-syntax containers edit-distance
         filepath mtl pretty transformers
@ -53621,8 +53653,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-plan-bounds";
-       version = "0.1.3";
-       sha256 = "0bngpl6j5q11axra38802qgyh1crghdq89dsfpfhyllyrkcmwci6";
+       version = "0.1.3.1";
+       sha256 = "0cyvmzgfzw6x2rl9jsswqgzxcvffjzc0px48ia22852vqa9qw1ax";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -60694,8 +60726,6 @@ self: {
       ];
       description = "Clash: a functional hardware description language - Prelude library";
       license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
     }) {};

  "clash-prelude-hedgehog" = callPackage
@ -63730,6 +63760,7 @@ self: {
       description = "Linear Programming using COIN-OR/CLP and comfort-array";
       license = lib.licenses.bsd3;
       badPlatforms = [ "aarch64-linux" ];
+       maintainers = [ lib.maintainers.thielema ];
     }) {inherit (pkgs) clp;};

  "cointracking-imports" = callPackage
@ -82340,6 +82371,27 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "diagrams-rasterific_1_4_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative
+     , Rasterific
+     }:
+     mkDerivation {
+       pname = "diagrams-rasterific";
+       version = "1.4.2.3";
+       sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class diagrams-core
+         diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
+         lens mtl optparse-applicative Rasterific
+       ];
+       testHaskellDepends = [ base diagrams-core diagrams-lib ];
+       description = "Rasterific backend for diagrams";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "diagrams-reflex" = callPackage
    ({ mkDerivation, base, colour, containers, diagrams-core
     , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom
@ -98988,8 +99040,8 @@ self: {
     }:
     mkDerivation {
       pname = "fbrnch";
-       version = "1.3.1";
-       sha256 = "0rg9mlk999rch4a6v48bb8yvdmkfqmnh9q70j7jn6bnwl0hl0v0w";
+       version = "1.3.2";
+       sha256 = "0qzfn271ka46f11hrbzq8axc3npkx1n5y5pihpg1gdccqmw6aazq";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -117238,6 +117290,7 @@ self: {
       librarySystemDepends = [ libGL ];
       description = "Complete OpenGL raw bindings";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libGL;};

  "gl-capture" = callPackage
@ -124889,6 +124942,7 @@ self: {
       ];
       description = "Raylib bindings for Haskell";
       license = lib.licenses.asl20;
+       badPlatforms = lib.platforms.darwin;
     }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
         inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
         inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
@ -138007,8 +138061,8 @@ self: {
     }:
     mkDerivation {
       pname = "hedgehog-extras";
-       version = "0.4.5.1";
-       sha256 = "1qqy8g9vjsa50j2nrm17z4f3jhvn1f9d5bxshcm1pz7hdkisy5hh";
+       version = "0.4.5.2";
+       sha256 = "1kdgjxdf9irk7sd8nlqxzppvppp9q6fcffhwpw3n62rf5rnsb6g3";
       libraryHaskellDepends = [
         aeson aeson-pretty async base bytestring deepseq Diff directory
         exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl
@ -143240,6 +143294,28 @@ self: {
       mainProgram = "hkgr";
     }) {};

+  "hkgr_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath
+     , simple-cabal, simple-cmd-args, simple-prompt, typed-process
+     , xdg-basedir
+     }:
+     mkDerivation {
+       pname = "hkgr";
+       version = "0.4.3";
+       sha256 = "0w9409hqjh8cl540dp60a0n2ci97qvq3iygvz9ys5v5j1jpj78rn";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base bytestring directory extra filepath simple-cabal
+         simple-cmd-args simple-prompt typed-process xdg-basedir
+       ];
+       description = "Simple Hackage release workflow for package maintainers";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "hkgr";
+     }) {};
+
  "hkt" = callPackage
    ({ mkDerivation, base, hspec, inspection-testing, protolude, text
     }:
@ -165875,6 +165951,7 @@ self: {
       executablePkgconfigDepends = [ ncurses ];
       description = "A game of competitive puzzle-design";
       license = lib.licenses.gpl3Only;
+       badPlatforms = lib.platforms.darwin;
       mainProgram = "intricacy";
     }) {inherit (pkgs) ncurses;};

@ -181671,6 +181748,8 @@ self: {
       libraryToolDepends = [ c2hs ];
       description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {inherit (pkgs) libssh2;};

  "libssh2-conduit" = callPackage
@ -181688,6 +181767,7 @@ self: {
       ];
       description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
     }) {};

  "libstackexchange" = callPackage
@ -182917,6 +182997,7 @@ self: {
       ];
       description = "Linear Programming basic definitions";
       license = lib.licenses.bsd3;
+       maintainers = [ lib.maintainers.thielema ];
     }) {};

  "linear-smc" = callPackage
@ -192076,6 +192157,22 @@ self: {
       broken = true;
     }) {};

+  "md5" = callPackage
+    ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+     , primitive
+     }:
+     mkDerivation {
+       pname = "md5";
+       version = "0.1.0.0";
+       sha256 = "0h0m6wwis1p2dl689wllywp338yxyykghfnznsq6jfb9vdfavzs4";
+       libraryHaskellDepends = [ base bytebuild byteslice primitive ];
+       testHaskellDepends = [
+         base bytebuild byteslice natural-arithmetic primitive
+       ];
+       description = "MD5 Hash";
+       license = lib.licenses.bsd3;
+     }) {};
+
  "mdapi" = callPackage
    ({ mkDerivation, aeson, base, bytestring, data-default, lens
     , lens-aeson, text, transformers, wreq
@ -199373,6 +199470,7 @@ self: {
       ];
       description = "A GUI library for writing native Haskell applications";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
       mainProgram = "dev-test-app";
     }) {inherit (pkgs) glew;};

@ -199419,6 +199517,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "A datagrid widget for the Monomer library";
       license = lib.licenses.mit;
+       badPlatforms = lib.platforms.darwin;
     }) {};

  "monomorphic" = callPackage
@ -200665,7 +200764,7 @@ self: {
       executableHaskellDepends = [ base ];
       description = "Save your spot when watching movies with @mplayer@";
       license = lib.licenses.bsd3;
-       badPlatforms = [ "aarch64-linux" ];
+       badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin;
       mainProgram = "mplayer-spot";
     }) {};

@ -204758,6 +204857,7 @@ self: {
       testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
       description = "Haskell bindings for nanovg";
       license = lib.licenses.isc;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) freetype; inherit (pkgs) glew; 
         inherit (pkgs) libGL; inherit (pkgs) libGLU; 
         inherit (pkgs.xorg) libX11;};
@ -224177,6 +224277,8 @@ self: {
       pname = "phatsort";
       version = "0.6.0.0";
       sha256 = "1cjmamla9383fk9715jxzlw87qnd26hpkcqhk4vvgld51nraf2pl";
+       revision = "1";
+       editedCabalFile = "0ivqjrahwjg6bl6k2nwb58avvyz7643js3zprabla1znlss36alv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -276857,6 +276959,8 @@ self: {
       pname = "statestack";
       version = "0.3.1.1";
       sha256 = "1747qzaj3xqc90fj4ddch3ra5kj52rfd1dn7a8c6fkdk68q76mfd";
+       revision = "1";
+       editedCabalFile = "0rxndmrq4gj1bc9cf20477n8d6kpri31dyl6x8f4h57yiwhblg55";
       libraryHaskellDepends = [ base mtl transformers ];
       description = "Simple State-like monad transformer with saveable and restorable state";
       license = lib.licenses.bsd3;
@ -282558,8 +282662,8 @@ self: {
    ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }:
     mkDerivation {
       pname = "svg-icons";
-       version = "2.9.3.0";
-       sha256 = "156nkyzkkfxvk21zdgfa20wmlisx9x8i798iljn76dv4zwqsslvq";
+       version = "2.10.0";
+       sha256 = "0r1xm2vn62crrhzn9kb64lz9d16ra9gj0qq208wmhz6906hz0kbf";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -325714,6 +325818,41 @@ self: {
       mainProgram = "zenacy-html-exe";
     }) {};

+  "zenacy-html_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, dlist, extra, HUnit, mtl, pretty-show
+     , raw-strings-qq, safe, safe-exceptions, test-framework
+     , test-framework-hunit, text, transformers, vector, word8
+     }:
+     mkDerivation {
+       pname = "zenacy-html";
+       version = "2.1.0";
+       sha256 = "0xyzgklkjlmx8jq5r67vkjgay4xkb2941m0cq9a8s4s4yjknvfh5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default dlist extra mtl pretty-show
+         safe safe-exceptions text transformers vector word8
+       ];
+       executableHaskellDepends = [
+         base bytestring containers data-default dlist extra pretty-show
+         text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default dlist extra HUnit mtl
+         pretty-show raw-strings-qq test-framework test-framework-hunit text
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion data-default dlist pretty-show
+         raw-strings-qq text
+       ];
+       description = "A standard compliant HTML parsing library";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "zenacy-html-exe";
+     }) {};
+
  "zenacy-unicode" = callPackage
    ({ mkDerivation, base, bytestring, HUnit, test-framework
     , test-framework-hunit, text, vector, word8
--- a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch
+++ b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch
@ -1,12 +0,0 @@
-diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs
-index 598048f..b652b76 100644
--- a/src/Gtk2HsSetup.hs
-+++ b/src/Gtk2HsSetup.hs
-@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
- ourC2hs bi lbi = PreProcessor {
- #endif
-   platformIndependent = False,
-+  ppOrdering = (\ _ _ ms -> return ms),
-   runPreProcessor = runC2HS bi lbi
- }
- 
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ispc, tbb, glfw,
  openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }:

 stdenv.mkDerivation rec {
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80=";
  };

+  patches = [
+    (fetchpatch {
+      name = "fixed-compilation-issues-for-arm-aarch64-processor-under-linux.patch";
+      url = "https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1.patch";
+      hash = "sha256-l9S4PBk+yQUypQ22l05daD0ruouZKE4VHkGvzKxkH4o=";
+    })
+  ];
+
  postPatch = ''
    # Fix duplicate /nix/store/.../nix/store/.../ paths
    sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \
@ -28,7 +36,6 @@ stdenv.mkDerivation rec {
    "-DTBB_INCLUDE_DIR=${tbb.dev}/include"
  ];

-
  nativeBuildInputs = [ ispc pkg-config cmake ];
  buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]
                ++ lib.optionals stdenv.isDarwin [ glib ];
@ -39,6 +46,5 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ hodapp gebner ];
    license = licenses.asl20;
    platforms = platforms.unix;
-    badPlatforms = [ "aarch64-linux" ];
  };
 }
--- a/pkgs/development/libraries/nuraft/default.nix
+++ b/pkgs/development/libraries/nuraft/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, asio, openssl, zlib }:

 stdenv.mkDerivation rec {
  pname = "nuraft";
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost172 asio openssl zlib ];
+  buildInputs = [ boost asio openssl zlib ];

  meta = with lib; {
    homepage = "https://github.com/eBay/NuRaft";
    description = "C++ implementation of Raft core logic as a replication library";
    license = licenses.asl20;
-    platforms = platforms.linux;
    maintainers = with maintainers; [ wheelsandmetal ];
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/ocaml-modules/memtrace/default.nix
+++ b/pkgs/development/ocaml-modules/memtrace/default.nix
@ -0,0 +1,23 @@
+{ lib, buildDunePackage, fetchFromGitHub
+}:
+
+buildDunePackage rec {
+  pname = "memtrace";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-y/Xz04CMFfRIzrDzGot16zEQsBMNc4J5s/q0VERcj04=";
+  };
+
+  minimalOCamlVersion = "4.11";
+
+  meta = with lib; {
+    homepage = "https://github.com/janestreet/${pname}";
+    description = "Streaming client for OCaml's Memprof";
+    license = licenses.mit;
+    maintainers = with maintainers; [ niols ];
+  };
+}
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.53";
+  version = "9.2.54";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-tOrnY+wCqG0gif6zo6QQS+iPszCY4LYBCMHRtRRXFf8=";
+    hash = "sha256-Wm8LV0R41muvhBNDsnoywI57ZRO022IaPFMZfVS4cPA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@ -32,7 +32,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.53";
+  version = "9.2.54";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-6WNzsojnYoxiykE5Jv7sw13u+L6i0NpRuE50+hV0G5Q=";
+    hash = "sha256-5EDVJN8o6Dkb3/QzJJ072RN1kYoMxDhrFnSVAzHzdNc=";
  };

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

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.53";
+  version = "9.2.54";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-DBUeT8E4acOHVuOmt1vlM9m3UeJwmybhZzG0Pvj5MgM=";
+    hash = "sha256-oAthM9ekGfMnkvX8AlslnABJ+LxjJV8OTTaWxJP3HyI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix
@ -9,12 +9,12 @@

 buildPythonPackage rec {
  pname = "azure-mgmt-frontdoor";
-  version = "1.0.1";
+  version = "1.1.0";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "sha256-nJXQ/BpyOwmybNUqE4cBxq5xxZE56lqgHSTKZTIHIuU=";
+    sha256 = "sha256-GqrJNNcQrNffgqRywgaJ2xkwy+fOJai/RlSVkpw6NWg=";
  };

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

 buildPythonPackage rec {
  pname = "azure-mgmt-keyvault";
-  version = "10.2.1";
+  version = "10.2.2";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-lozs6Jy6V5cJigM7NUn8eyP/EVf/TKk+pZ9vABgAqK0=";
+    hash = "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@ -9,7 +9,7 @@
 }:

 buildPythonPackage rec {
-  version = "23.0.1";
+  version = "23.1.0";
  pname = "azure-mgmt-network";
  format = "setuptools";

@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-VRkaaCNvuzOS/vR9iCum+WaIqBG9Y+3sRquNY2OniTA=";
+    hash = "sha256-NxcmmRE4MdfOG7naNcY1AHxzz/xUmoWlj1VUK1SxK/M=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@ -7,13 +7,13 @@
 }:

 buildPythonPackage rec {
-  version = "1.1.0";
+  version = "1.2.0";
  pname = "azure-multiapi-storage";
  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-VvNI+mhi2nCFBAXUEL5ph3xj/cBRMf2Mo2uXIgKC+oc=";
+    hash = "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I=";
  };

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

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.53";
+  version = "9.2.54";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ufS/xGEnyXOzFevONsaFHyHNvPnEKvkJ5NkDpnWuMT8=";
+    hash = "sha256-YZvc2BIc8dAvDFfJ9+DEkfi8pXTFB0gQ5z7irYKZkw8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@ -16,7 +16,7 @@

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.53";
+  version = "9.2.54";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-qQPWSCKhiZ5RBR2OShwc+W7QZn+Lh7487PJEnJpUOnU=";
+    hash = "sha256-LezNPmHEy+rDGERhGfKuHGwfjAqlfBYxapjnxcY25ug=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/in-n-out/default.nix
+++ b/pkgs/development/python-modules/in-n-out/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "in-n-out";
-  version = "0.1.6";
+  version = "0.1.7";
  format = "setuptools";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-PuzjidORMFVlmFZbmnu9O92FoiuXrC8NNRyjwdodriY=";
+    hash = "sha256-g4Dw0ejB6BxcMpRZGgxNDeAyuY93UROVsIrAwv6vSqY=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@ -17,6 +17,8 @@
 buildPythonPackage rec {
  pname = "jaxopt";
  version = "0.5.5";
+  format = "setuptools";
+
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
@ -50,6 +52,11 @@ buildPythonPackage rec {
    "jaxopt.tree_util"
  ];

+  disabledTests = [
+    # Stack frame issue
+    "test_bisect"
+  ];
+
  meta = with lib; {
    homepage = "https://jaxopt.github.io";
    description = "Hardware accelerated, batchable and differentiable optimizers in JAX";
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@ -31,7 +31,7 @@

 buildPythonPackage rec {
  pname = "pyunifiprotect";
-  version = "4.9.1";
+  version = "4.10.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -40,7 +40,7 @@ buildPythonPackage rec {
    owner = "briis";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ESTJx3wyM59yzfEykYFobgInQVBEzESCIl2dhTOGUKw=";
+    hash = "sha256-DJxfr4pQna+up5XYi4zs66oTuHzLVz0bEuql6mW2e70=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.2.53";
+  version = "9.2.54";
  format = "pyproject";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-CDxy0YSGxSfugkgPvuK8CbmEFAs5DYd5bCHtuvQwrxM=";
+    hash = "sha256-0X2K3glUWIJjiThvsTwIPUA3TVf9ret74B3BcAcr9bE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/takethetime/default.nix
+++ b/pkgs/development/python-modules/takethetime/default.nix
@ -1,37 +1,26 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , pythonOlder
-, pytestCheckHook
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "takethetime";
  version = "0.3.1";

-  # pypi distribution doesn't include tests, so build from source instead
-  src = fetchFromGitHub {
-    owner = "ErikBjare";
-    repo = "TakeTheTime";
-    rev = "b0042ac5b1cc9d3b70ef59167b094469ceb660dd";
-    sha256 = "sha256-DwsMnP6G3BzOnINttaSC6QKkIKK5qyhUz+lN1DSvkw0=";
+  src = fetchPypi {
+    pname = "TakeTheTime";
+    inherit version;
+    sha256 = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k=";
  };

  disabled = pythonOlder "3.6";

-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pytestFlagsArray = [ "tests/tests.py" ];
+  # all tests are timing dependent
+  doCheck = false;

  pythonImportsCheck = [ "takethetime" ];

-  # Latest release is v0.3.1 on pypi, but this version was not bumped in
-  # the setup.py, causing packages that depend on v0.3.1 to fail to build.
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "version='0.3'" "version='0.3.1'"
-  '';
-
  meta = with lib; {
    description = "Simple time taking library using context managers";
    homepage = "https://github.com/ErikBjare/TakeTheTime";
--- a/pkgs/development/python-modules/tidalapi/default.nix
+++ b/pkgs/development/python-modules/tidalapi/default.nix
@ -8,12 +8,12 @@

 buildPythonPackage rec {
  pname = "tidalapi";
-  version = "0.7.0";
+  version = "0.7.1";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-LdlTBkCOb7tXiupsNJ5lbk38syKXeADvi2IdGpW/dk8=";
+    hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g=";
  };

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

 buildPythonPackage rec {
  pname = "waqiasync";
-  version = "1.0.0";
+  version = "1.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1yxls7ywfg954c3vxgnp98qa1b8dsq9b2fld11fb9sx1k4mjc29d";
+    sha256 = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@ -0,0 +1,29 @@
+{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
+
+let
+  pname = "cargo-pgrx";
+  version = "0.9.2";
+in
+rustPlatform.buildRustPackage rec {
+  inherit version pname;
+
+  src = fetchCrate {
+    inherit version pname;
+    hash = "sha256-z5YmeUBXLyPfodKAI/t2I4sMg0nbdo0thTgoT/kSuwo=";
+  };
+
+  cargoHash = "sha256-Ox/jk2+cLNpfBU5IxILMPYaFi56BmfehmA+WDaEkae0=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with lib; {
+    description = "Build Postgres Extensions with Rust!";
+    homepage = "https://github.com/tcdi/pgrx";
+    changelog = "https://github.com/tcdi/pgrx/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}
--- a/pkgs/games/anki/bin.nix
+++ b/pkgs/games/anki/bin.nix
@ -3,22 +3,22 @@
 let
  pname = "anki-bin";
  # Update hashes for both Linux and Darwin!
-  version = "2.1.64";
+  version = "2.1.65";

  sources = {
    linux = fetchurl {
      url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
-      sha256 = "sha256-J3bfqqleE5DSfEUnzbWBYdMg653MokW9LYN3rnLd/mU=";
+      sha256 = "sha256-JBqW/aCMUyR0H52WMYuVkcE3/t/joLxfvFho64IzvDg=";
    };

    # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
    darwin-x86_64 = fetchurl {
      url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
-      sha256 = "sha256-5vve6eiH/OlCqa2HINQfuwmGDpjc1uiiVJSc6iF5rlo=";
+      sha256 = "sha256-zmCI77yLdoJm/znUgy+xZ8Jd77F3CPlzq3ceBzckA4U=";
    };
    darwin-aarch64 = fetchurl {
      url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
-      sha256 = "sha256-SJWRAI1Xi92pIcOUaW8c4sLAAJTUWteL4oqXm66OWvs=";
+      sha256 = "sha256-1owbeL28dnOYD7nR9uZt9EHvFK75GFGRe6S9oV85Eoo=";
    };
  };

--- a/pkgs/servers/psitransfer/node-composition.nix
+++ b/pkgs/servers/psitransfer/node-composition.nix
@ -2,7 +2,7 @@

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}:

 let
  nodeEnv = import ../../development/node-packages/node-env.nix {
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config
-, openssl, boost, grpc, protobuf, libnsl }:
+, openssl, boost, grpc, protobuf, libnsl, rocksdb_6_23, snappy }:

 let
  sqlite3 = fetchurl rec {
@ -13,14 +13,6 @@ let
    enabledStatic = true;
  };

-  beast = fetchgit {
-    url = "https://github.com/boostorg/beast.git";
-    rev = "2f9a8440c2432d8a196571d6300404cb76314125";
-    sha256 = "1n9ms5cn67b0p0mhldz5psgylds22sm5x22q7knrsf20856vlk5a";
-    fetchSubmodules = false;
-    leaveDotGit = true;
-  };
-
  docca = fetchgit {
    url = "https://github.com/vinniefalco/docca.git";
    rev = "335dbf9c3613e997ed56d540cc8c5ff2e28cab2d";
@ -38,7 +30,7 @@ let
    postFetch = "cd $out && git tag ${rev}";
  };

-  rocksdb = fetchgit rec {
+  rocksdb = fetchgit {
    url = "https://github.com/facebook/rocksdb.git";
    rev = "v6.7.3";
    sha256 = "0dzn5jg3i2mnnjj24dn9lzi3aajj5ga2akjf64lybyj481lq445k";
@ -73,24 +65,6 @@ let
    fetchSubmodules = false;
  };

-  snappy = fetchgit rec {
-    url = "https://github.com/google/snappy.git";
-    rev = "1.1.7";
-    sha256 = "1f0i0sz5gc8aqd594zn3py6j4w86gi1xry6qaz2vzyl4w7cb4v35";
-    leaveDotGit = true;
-    fetchSubmodules = false;
-    postFetch = "cd $out && git tag ${rev}";
-  };
-
-  cares = fetchgit rec {
-    url = "https://github.com/c-ares/c-ares.git";
-    rev = "cares-1_15_0";
-    sha256 = "1fkzsyhfk5p5hr4dx4r36pg9xzs0md6cyj1q2dni3cjgqj3s518v";
-    leaveDotGit = true;
-    fetchSubmodules = false;
-    postFetch = "cd $out && git tag ${rev}";
-  };
-
  google-test = fetchgit {
    url = "https://github.com/google/googletest.git";
    rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081";
@ -116,31 +90,31 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "rippled";
-  version = "1.7.3";
+  version = "1.9.4";

  src = fetchgit {
    url = "https://github.com/ripple/rippled.git";
    rev = version;
-    sha256 = "008qzb138r2pi0cqj4d6d5f0grlb2gm87m8j0dj8b0giya22xv6s";
    leaveDotGit = true;
    fetchSubmodules = true;
+    hash = "sha256-VW/VmnhtF2xyHfEud3D6b3n8uTE0a/nDW1GISs5QfwM=";
  };

  hardeningDisable = ["format"];
-  cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"];
+  cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DSNAPPY_INCLUDE_DIR=${snappy}/include" ];

  nativeBuildInputs = [ pkg-config cmake git ];
-  buildInputs = [ openssl openssl.dev boostSharedStatic grpc protobuf libnsl ];
+  buildInputs = [ openssl openssl.dev boostSharedStatic grpc protobuf libnsl rocksdb_6_23 snappy ];

  preConfigure = ''
    export HOME=$PWD

+    git config --global protocol.file.allow always
    git config --global url."file://${rocksdb}".insteadOf "${rocksdb.url}"
    git config --global url."file://${docca}".insteadOf "${docca.url}"
    git config --global url."file://${lz4}".insteadOf "${lz4.url}"
    git config --global url."file://${libarchive}".insteadOf "${libarchive.url}"
    git config --global url."file://${soci}".insteadOf "${soci.url}"
-    git config --global url."file://${snappy}".insteadOf "${snappy.url}"
    git config --global url."file://${nudb}".insteadOf "${nudb.url}"
    git config --global url."file://${google-benchmark}".insteadOf "${google-benchmark.url}"
    git config --global url."file://${google-test}".insteadOf "${google-test.url}"
@ -150,6 +124,8 @@ in stdenv.mkDerivation rec {
    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}"
+
+    substituteInPlace Builds/CMake/deps/Rocksdb.cmake --replace "RocksDB 6.27" "RocksDB"
  '';

  doCheck = true;
@ -162,7 +138,6 @@ in stdenv.mkDerivation rec {
    homepage = "https://github.com/ripple/rippled";
    maintainers = with maintainers; [ offline RaghavSood ];
    license = licenses.isc;
-    platforms = [ "x86_64-linux" ];
-    knownVulnerabilities = [ "CVE-2022-29077" ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@ -5,17 +5,17 @@

 buildGoModule rec {
  pname = "trivy";
-  version = "0.41.0";
+  version = "0.42.0";

  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-GDApctrRWRJ9svPBWGt86slnCtmZyciQ03rhYW1958s=";
+    sha256 = "sha256-TmtQ7rs77W6YFjh3y9kvIZabcGT6U/SCr5Hg6pa7K+s=";
  };
  # hash missmatch on across linux and darwin
  proxyVendor = true;
-  vendorHash = "sha256-JlLQpBiviVXcX1xK0pi2igErCzvOXBc28m4fzDuIQ1U=";
+  vendorHash = "sha256-4YUJ4HfbAvYt/QtI9wmh8326T4avIXCtPkICo4lEpqQ=";

  excludedPackages = [ "magefiles" "misc" ];

--- a/pkgs/tools/misc/rtx/default.nix
+++ b/pkgs/tools/misc/rtx/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "rtx";
-  version = "1.30.5";
+  version = "1.32.0";

  src = fetchFromGitHub {
    owner = "jdxcode";
    repo = "rtx";
    rev = "v${version}";
-    sha256 = "sha256-xJecTvhRMHyGOT1JJPSp+k5bI0FvIP2uySBt1R0YZ30=";
+    sha256 = "sha256-1TaBxVu/aNZ3iZWlo1Gn9pFK5j/vKsx6yT+eAPkmYSw=";
  };

-  cargoSha256 = "sha256-29aGVKINVemppy+3nGDf5okvmJm72pVYUVbefuey0H8=";
+  cargoSha256 = "sha256-wgTckF1IqnTa6gYVYHDNLdyx2w2urYG5Qqkq1iyuA3M=";

  nativeBuildInputs = [ installShellFiles ];
  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
      --zsh ./completions/_rtx
  '';

-  meta = rec {
+  meta = {
    homepage = "https://github.com/jdxcode/rtx";
    description = "Polyglot runtime manager (asdf rust clone)";
    changelog = "https://github.com/jdxcode/rtx/releases/tag/v${version}";
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@ -4,7 +4,6 @@
 , rustPlatform
 , installShellFiles
 , cmake
-, fetchpatch
 , git
 , nixosTests
 , Security
@ -14,13 +13,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "starship";
-  version = "1.14.2";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "starship";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-t+Ur6QmemMz6WAZnii7f2O+9R7hPp+5oej4PuaifznE=";
+    hash = "sha256-aINiWzkt4sAWgcGdkHTb2KRMh2z+LiOhDdTJbzbXwR4=";
  };

  nativeBuildInputs = [ installShellFiles cmake ];
@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
      --zsh <($out/bin/starship completions zsh)
  '';

-  cargoHash = "sha256-NSUId0CXTRF1Qqo9XPDgxY2vMyMBuJtJYGGuQ0HHk90=";
+  cargoHash = "sha256-XT2kgiITtG1FNyztNvos/r01pvdF1xPhHA4+YhFGFEU=";

  nativeCheckInputs = [ git ];

--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@ -12,16 +12,6 @@ in rec {
    };
  };

-  openconnect_unstable = common {
-    version = "unstable-2022-03-14";
-    src = fetchFromGitLab {
-      owner = "openconnect";
-      repo = "openconnect";
-      rev = "a27a46f1362978db9723c8730f2533516b4b31b1";
-      sha256 = "sha256-Kz98GHCyEcx7vUF+AXMLR7886+iKGKNwx1iRaYcH8ps=";
-    };
-  };
-
  openconnect_openssl = openconnect.override {
    useOpenSSL = true;
  };
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "gitleaks";
-  version = "8.16.3";
+  version = "8.16.4";

  src = fetchFromGitHub {
    owner = "zricethezav";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-WukTYi7iqagOLpx8KATEittlM6OvIfxDYiNTdsotjTY=";
+    hash = "sha256-j07Uw9MVNUSHw8wwKPal1ENywS4vk/blU11DElhgdFU=";
  };

  vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "nuclei";
-  version = "2.9.5";
+  version = "2.9.6";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-+ndLh4T9Kznzx6Qgh2EQm/cSvRb6+1goOMELS8sUHPc=";
+    hash = "sha256-hltXm+NXExmO9IuwdfuET9+PaRby9pLAE/4ac7xQqvE=";
  };

-  vendorHash = "sha256-vAzyqFUluqEKeYw8unUjmyuw/c7yQYTGjLpHdYI5es8=";
+  vendorHash = "sha256-geQBa0caKjDQD3AlVNhU8cmM9mFSR+Ix0HjxKKadSqE=";

  modRoot = "./v2";
  subPackages = [
--- a/pkgs/tools/security/onlykey/generate.sh
+++ b/pkgs/tools/security/onlykey/generate.sh
@ -2,4 +2,4 @@
 #! nix-shell -i bash -p nodePackages.node2nix

 # XXX: --development is given here because we need access to gulp in order to build OnlyKey.
-exec node2nix --nodejs-14 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
+exec node2nix --nodejs-18 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
--- a/pkgs/tools/security/onlykey/node-packages.nix
+++ b/pkgs/tools/security/onlykey/node-packages.nix
--- a/pkgs/tools/security/onlykey/onlykey.nix
+++ b/pkgs/tools/security/onlykey/onlykey.nix
@ -2,7 +2,7 @@

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}:

 let
  nodeEnv = import ../../../development/node-packages/node-env.nix {
--- a/pkgs/tools/security/onlykey/package.json
+++ b/pkgs/tools/security/onlykey/package.json
@ -1,3 +1,3 @@
 [
-  {"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.4"}
+  {"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.5.0"}
 ]
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1185,6 +1185,7 @@ mapAliases ({
  openconnect_head = openconnect_unstable; # Added 2022-03-29
  openconnect_gnutls = openconnect; # Added 2022-03-29
  openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21
+  openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01
  openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10
  openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22
  openimageio2 = openimageio; # Added 2023-01-05
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -13642,7 +13642,7 @@ with pkgs;

  openconnectPackages = callPackage ../tools/networking/openconnect { };

-  inherit (openconnectPackages) openconnect openconnect_unstable openconnect_openssl;
+  inherit (openconnectPackages) openconnect openconnect_openssl;

  globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { };

@ -16462,6 +16462,9 @@ with pkgs;
  buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
+  cargo-pgrx = callPackage ../development/tools/rust/cargo-pgrx/default.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
  cargo-release = callPackage ../development/tools/rust/cargo-release { };
  cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
  cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
@ -26305,9 +26308,8 @@ with pkgs;
    libtool = darwin.cctools;
  };

-  # Fails to compile with boost <= 1.72
  rippled = callPackage ../servers/rippled {
-    boost = boost172;
+    boost = boost177;
  };

  rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };
@ -34155,6 +34157,8 @@ with pkgs;

  shadowfox = callPackage ../tools/networking/shadowfox { };

+  shavee = callPackage ../applications/misc/shavee { };
+
  shell_gpt = callPackage ../tools/misc/shell_gpt { };

  shfmt = callPackage ../tools/text/shfmt { };
@ -34322,9 +34326,7 @@ with pkgs;

  ly = callPackage ../applications/display-managers/ly { };

-  slic3r = callPackage ../applications/misc/slic3r {
-    boost = boost172; # Building fails with Boost >1.72 due to boost/detail/endian.hpp missing
-  };
+  slic3r = callPackage ../applications/misc/slic3r { };

  curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };

@ -34995,7 +34997,7 @@ with pkgs;

  macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; };

-  vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
+  vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix {
    inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
    inherit (darwin) libobjc;
  });
@ -36231,8 +36233,6 @@ with pkgs;

  rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { };

-  shavee = callPackage ../games/doom-ports/shavee { };
-
  slade = callPackage ../games/doom-ports/slade {
    wxGTK = wxGTK32.override {
      withWebKit = true;
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -936,6 +936,8 @@ let

    mec = callPackage ../development/ocaml-modules/mec { };

+    memtrace = callPackage ../development/ocaml-modules/memtrace { };
+
    menhir = callPackage ../development/ocaml-modules/menhir { };

    menhirLib = callPackage ../development/ocaml-modules/menhir/lib.nix { };