Merge master into haskell-updates

2023-03-31 00:13:08 +00:00 · 2023-03-31 00:13:08 +00:00 · 7841c98b5a
commit 7841c98b5a
parent cd111f458f 57ab8f57e2
189 changed files with 2142 additions and 11549 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -237,8 +237,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/vim/plugins         @figsoda @jonringer

 # VsCode Extensions
-/pkgs/applications/editors/vscode @superherointj
-/pkgs/applications/editors/vscode/extensions   @jonringer @superherointj
+/pkgs/applications/editors/vscode/extensions   @jonringer

 # Prometheus exporter modules and tests
 /nixos/modules/services/monitoring/prometheus/exporters.nix  @WilliButz
@ -312,6 +311,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /doc/languages-frameworks/javascript.section.md @winterqt

 # OCaml
-/pkgs/build-support/ocaml           @romildo @superherointj @ulrikstrid
-/pkgs/development/compilers/ocaml   @romildo @superherointj @ulrikstrid
-/pkgs/development/ocaml-modules     @romildo @superherointj @ulrikstrid
+/pkgs/build-support/ocaml           @romildo @ulrikstrid
+/pkgs/development/compilers/ocaml   @romildo @ulrikstrid
+/pkgs/development/ocaml-modules     @romildo @ulrikstrid
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1974,12 +1974,6 @@
    githubId = 28444296;
    name = "Benjamin Hougland";
  };
-  bigzilla = {
-    email = "m.billyzaelani@gmail.com";
-    github = "bigzilla";
-    githubId = 20436235;
-    name = "Billy Zaelani Malik";
-  };
  billewanick = {
    email = "bill@ewanick.com";
    github = "billewanick";
@ -3258,6 +3252,13 @@
      fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B";
    }];
  };
+  cyntheticfox = {
+    email = "houstdav000@gmail.com";
+    github = "cyntheticfox";
+    githubId = 17628961;
+    matrix = "@houstdav000:gh0st.ems.host";
+    name = "Cynthia Fox";
+  };
  cyounkins = {
    name = "Craig Younkins";
    email = "cyounkins@gmail.com";
@ -6176,13 +6177,6 @@
    githubId = 25618740;
    name = "Vincent Cui";
  };
-  houstdav000 = {
-    email = "houstdav000@gmail.com";
-    github = "houstdav000";
-    githubId = 17628961;
-    matrix = "@houstdav000:gh0st.ems.host";
-    name = "David Houston";
-  };
  hoverbear = {
    email = "operator+nix@hoverbear.org";
    matrix = "@hoverbear:matrix.org";
@ -10031,6 +10025,12 @@
      fingerprint = "D520 AC8D 7C96 9212 5B2B  BD3A 1AFD 1025 6B3C 714D";
    }];
  };
+  minizilla = {
+    email = "m.billyzaelani@gmail.com";
+    github = "minizilla";
+    githubId = 20436235;
+    name = "Billy Zaelani Malik";
+  };
  mir06 = {
    email = "armin.leuprecht@uni-graz.at";
    github = "mir06";
@ -11545,6 +11545,12 @@
    githubId = 686076;
    name = "Vitalii Voloshyn";
  };
+  panda2134 = {
+    email = "me+nixpkgs@panda2134.site";
+    github = "panda2134";
+    githubId = 7239200;
+    name = "panda2134";
+  };
  pandaman = {
    email = "kointosudesuyo@infoseek.jp";
    github = "pandaman64";
@ -15985,6 +15991,12 @@
      fingerprint = "AEF2 3487 66F3 71C6 89A7  3600 95A4 2FE8 3535 25F9";
    }];
  };
+  vinnymeller = {
+    email = "vinnymeller@proton.me";
+    github = "vinnymeller";
+    githubId = 19894025;
+    name = "Vinny Meller";
+  };
  vinymeuh = {
    email = "vinymeuh@gmail.com";
    github = "vinymeuh";
--- a/nixos/modules/services/backup/sanoid.nix
+++ b/nixos/modules/services/backup/sanoid.nix
@ -114,6 +114,8 @@ in
  options.services.sanoid = {
    enable = mkEnableOption (lib.mdDoc "Sanoid ZFS snapshotting service");

+    package = lib.mkPackageOptionMD pkgs "sanoid" {};
+
    interval = mkOption {
      type = types.str;
      default = "hourly";
@ -181,7 +183,7 @@ in
        ExecStartPre = (map (buildAllowCommand "allow" [ "snapshot" "mount" "destroy" ]) datasets);
        ExecStopPost = (map (buildAllowCommand "unallow" [ "snapshot" "mount" "destroy" ]) datasets);
        ExecStart = lib.escapeShellArgs ([
-          "${pkgs.sanoid}/bin/sanoid"
+          "${cfg.package}/bin/sanoid"
          "--cron"
          "--configdir"
          (pkgs.writeTextDir "sanoid.conf" configFile)
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@ -87,6 +87,8 @@ in
  options.services.syncoid = {
    enable = mkEnableOption (lib.mdDoc "Syncoid ZFS synchronization service");

+    package = lib.mkPackageOptionMD pkgs "sanoid" {};
+
    interval = mkOption {
      type = types.str;
      default = "hourly";
@ -331,7 +333,7 @@ in
              ExecStopPost =
                (map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++
                (map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target));
-              ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ]
+              ExecStart = lib.escapeShellArgs ([ "${cfg.package}/bin/syncoid" ]
                ++ optionals c.useCommonArgs cfg.commonArgs
                ++ optional c.recursive "-r"
                ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ]
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@ -147,8 +147,8 @@ in

    systemd.services.k3s = {
      description = "k3s service";
-      after = [ "network.service" "firewall.service" ];
-      wants = [ "network.service" "firewall.service" ];
+      after = [ "firewall.service" "network-online.target" ];
+      wants = [ "firewall.service" "network-online.target" ];
      wantedBy = [ "multi-user.target" ];
      path = optional config.boot.zfs.enabled config.boot.zfs.package;
      serviceConfig = {
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@ -22,6 +22,8 @@ in {
      '';
    };

+    package = lib.mkPackageOptionMD pkgs "grafana-loki" { };
+
    group = mkOption {
      type = types.str;
      default = "loki";
@ -78,7 +80,7 @@ in {
      '';
    }];

-    environment.systemPackages = [ pkgs.grafana-loki ]; # logcli
+    environment.systemPackages = [ cfg.package ]; # logcli

    users.groups.${cfg.group} = { };
    users.users.${cfg.user} = {
@ -99,7 +101,7 @@ in {
               else cfg.configFile;
      in
      {
-        ExecStart = "${pkgs.grafana-loki}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";
+        ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";
        User = cfg.user;
        Restart = "always";
        PrivateTmp = true;
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@ -338,6 +338,12 @@ in


  config = {
+    assertions = [
+      {
+        assertion = config.system.copySystemConfiguration -> !lib.inPureEvalMode;
+        message = "system.copySystemConfiguration is not supported with flakes";
+      }
+    ];

    system.extraSystemBuilderCmds =
      optionalString
--- a/nixos/modules/virtualisation/linode-image.nix
+++ b/nixos/modules/virtualisation/linode-image.nix
@ -62,5 +62,5 @@ in
    };
  };

-  meta.maintainers = with maintainers; [ houstdav000 ];
+  meta.maintainers = with maintainers; [ cyntheticfox ];
 }
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@ -14,6 +14,8 @@
 , pcaudiolib
 , sonicSupport ? true
 , sonic
+, alsa-plugins
+, makeWrapper
 }:

 stdenv.mkDerivation rec {
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ];
+  nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn makeWrapper ];

  buildInputs = lib.optional mbrolaSupport mbrola
    ++ lib.optional pcaudiolibSupport pcaudiolib
@ -49,6 +51,8 @@ stdenv.mkDerivation rec {

  postInstall = lib.optionalString stdenv.isLinux ''
    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng
+    wrapProgram $out/bin/espeak-ng \
+      --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
  '';

  passthru = {
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@ -32,13 +32,13 @@

 stdenv.mkDerivation rec {
  pname = "musikcube";
-  version = "0.99.6";
+  version = "0.99.7";

  src = fetchFromGitHub {
    owner = "clangen";
    repo = pname;
    rev = version;
-    sha256 = "sha256-D25P254iaOsS0TyAKAiarDP37D4U9Dw7mdvUin/Qblc=";
+    sha256 = "sha256-bsvq48zTNafsQGFXVApCEWIL8H2RXiowalEu/W3DUu0=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1256,12 +1256,33 @@ let
        };
      };

+      github.vscode-github-actions = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-github-actions";
+          publisher = "github";
+          version = "0.25.3";
+          sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI=";
+        };
+        meta = {
+          description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions";
+          homepage = "https://github.com/github/vscode-github-actions";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.drupol ];
+        };
+      };
+
      github.vscode-pull-request-github = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "vscode-pull-request-github";
          publisher = "github";
-          version = "0.61.2023032418";
-          sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E=";
+          # Stable versions are listed on the GitHub releases page and use a
+          # semver scheme, contrary to preview versions which are listed on
+          # the VSCode Marketplace and use a calver scheme. We should avoid
+          # using preview versions, because they can require insider versions
+          # of VS Code
+          version = "0.60.0";
+          sha256 = "sha256-VAoKNRYrzUXUQSDAX8NM17aknCUxMRsTRd5adQu+w/s=";
        };
        meta = { license = lib.licenses.mit; };
      };
@ -2122,6 +2143,23 @@ let
        };
      };

+      nvarner.typst-lsp = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "typst-lsp";
+          publisher = "nvarner";
+          version = "0.3.0";
+          sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
+          description = "A VSCode extension for providing a language server for Typst";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp";
+          homepage = "https://github.com/nvarner/typst-lsp";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.drupol ];
+        };
+      };
+
      ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog";
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -18,17 +18,17 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "1h8iryrcn22i2vxh7srlfy1amdvkk6p7fk6wmsbylhb845zfq0s2";
-    x86_64-darwin = "1q2nfm89m9lp9mf7q62l17z9gkmj0fpjmn905x7dw8xjlslkp9v8";
-    aarch64-linux = "19y661ad95dmr9hhkmb8a2w17jj4c9ywlg49bi2r5l7birv4v6hy";
-    aarch64-darwin = "18ycg1hj26zj68zni314wpbl3h8p7jw3lf2h791vjzbpgjznxnz4";
-    armv7l-linux = "0hk67pik1z1s1nd2m0xc8zgfyn8i7v2z14j5bmc48k7spirrpz7r";
+    x86_64-linux = "1j9m31d760zrmj1gwfqnxvji8kmm8sx2s9p2mam3vsk5mb9l3n58";
+    x86_64-darwin = "1p54yrmcv7xlgj247yyj7y83q92jx2vhjkx6hrbqcai67ixw531w";
+    aarch64-linux = "1m2xqy9lnb3ifnh90lq9qk3fd3h6nmk5fnwrlyjgrg395hvgk4ai";
+    aarch64-darwin = "15n8g5rwz1h31dish9idwzvqimx3civn4rj1jzhnq77aixk8p5z3";
+    armv7l-linux = "1j1nlbcpncb0s2gn1520kxqqamga3gh1slr7scl24mj1z8fg5r1n";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.76.2";
+    version = "1.77.0";
    pname = "vscode";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@ -29,13 +29,13 @@

 buildDotnetModule rec {
  pname = "ryujinx";
-  version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.687"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

  src = fetchFromGitHub {
    owner = "Ryujinx";
    repo = "Ryujinx";
-    rev = "da073fce6127243fcd93b736cde951c4e835e508";
-    sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f";
+    rev = "460f96967de6f5cb729ed57baaa4dad2178c8cb6";
+    sha256 = "008mjih7lp2zq86g750s237d9g2p2jqfryp6izac3iqr3s7dbr6g";
  };

  dotnet-sdk = dotnetCorePackages.sdk_7_0;
--- a/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/pkgs/applications/emulators/ryujinx/deps.nix
@ -53,6 +53,7 @@
  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; })
+  (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
@ -130,7 +131,7 @@
  (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; })
  (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; })
  (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; })
-  (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.1-build23"; sha256 = "1qnz15q2g6qknjgbv3pb53llqpb4lcwfwmgfvm6325zxjm79r792"; })
+  (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; })
  (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
  (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
  (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; })
@ -273,6 +274,6 @@
  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
  (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })
-  (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-f7c841d"; sha256 = "1fxvv77hgbblb14xwdpk231cgm5b3wl0li1ksx2vswxi9n758hrk"; })
+  (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-fb78016"; sha256 = "1r43b5fd5q8xq8b5nk11jsz2gnm96dh7sxc0rrv2p605ivz7icin"; })
  (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; })
 ]
--- 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.0";
+  version = "0.9.1";

  src = fetchurl {
    url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    hash = "sha256-5oX1LhqWvNiMF9ZI7BvpHe4bhB3vQp6dsjLYMQ9Jy+o=";
+    hash = "sha256-8jplCIylG1xbpp/VGnU06MwfqWe2E9iVQApZaWbhuVc=";
    name = "${pname}-${version}.AppImage";
  };

@ -41,9 +41,12 @@ stdenv.mkDerivation rec {
    rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git
    chmod -w $out/share/${pname}/resources/app/node_modules/dugite

+    mkdir -p $out/share/pixmaps
+    ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png
+
    substituteInPlace $out/share/applications/${pname}.desktop \
      --replace Exec=Logseq Exec=${pname} \
-      --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png
+      --replace Icon=Logseq Icon=${pname}

    runHook postInstall
  '';
--- a/pkgs/applications/misc/megacmd/default.nix
+++ b/pkgs/applications/misc/megacmd/default.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "megacmd";
-  version = "1.6.0";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "meganz";
    repo = "MEGAcmd";
    rev = "${version}_Linux";
-    sha256 = "sha256-EPY2BjTECia0eBGmv8tmeil1WibIA6R+DK7MmOMufLw=";
+    sha256 = "sha256-X8ysTVr4oZS3VHuCyq96J6TL9nvtAT/HVnMyz5iXSXo=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/river-luatile/default.nix
+++ b/pkgs/applications/misc/river-luatile/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "river-luatile";
-  version = "0.1.1";
+  version = "0.1.2";

  src = fetchFromGitHub {
    owner = "MaxVerevkin";
    repo = "river-luatile";
    rev = "v${version}";
-    hash = "sha256-eZgoFbat7X/jh5udlNyIuTheBUCHpaVRbsojYLATO18=";
+    hash = "sha256-flh1zUBranb7w1fQuinHbVRGlVxfl2aKxSwShHFG6tI=";
  };

-  cargoHash = "sha256-Vqyt5bL1lVhy/Wxd+zF7Wugvb7dW1N9Kq2TTFSaodnE=";
+  cargoHash = "sha256-9YQxa6folwCJNoEa75InRbK1X7cD4F5QGzeGlfsr/5s=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@ -130,6 +130,10 @@ buildPythonApplication rec {
    bash dev/test.sh
    runHook postCheck
  '';
+  postInstall = ''
+    python dev/zsh-completion.py
+    install -Dm644 _visidata -t $out/share/zsh/site-functions
+  '';

  pythonImportsCheck = ["visidata"];

--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "xmrig";
-  version = "6.19.0";
+  version = "6.19.1";

  src = fetchFromGitHub {
    owner = "xmrig";
    repo = "xmrig";
    rev = "v${version}";
-    hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM=";
+    hash = "sha256-m8ot/IbpxdzHOyJymzZ7MWt4p78GTUuTjYZ9P1oGpWI=";
  };

  patches = [
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -32,21 +32,21 @@
    }
  },
  "dev": {
-    "version": "113.0.5653.0",
-    "sha256": "1s1as01javi8z4sax70rx4cn03lwfis75rkv58yk7sfhj3qafzhk",
-    "sha256bin64": "1i1zkdq8qzm8r5lg10qmqaycx45m2qc9fzjql0si0amy81sdkfsn",
+    "version": "113.0.5668.0",
+    "sha256": "0rp43m8n26rs2hiysavr0w65x27i6n94jghx81w92fxbfjkc0qp3",
+    "sha256bin64": "1xnx8pg0xhbw2va8bm97x092andzzvqxcm9ydi7d6qadhwqam1br",
    "deps": {
      "gn": {
-        "version": "2023-02-24",
+        "version": "2023-03-18",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "fe330c0ae1ec29db30b6f830e50771a335e071fb",
-        "sha256": "0fj8kfck53hbfz30m8p0mfcqbjs9cjrlfzi03l3h7n7yd88js8i4"
+        "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
+        "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
      }
    }
  },
  "ungoogled-chromium": {
-    "version": "111.0.5563.111",
-    "sha256": "0r03p8m92fwsi8z1i8qjwllbb68gkspnzwynvmag3jy5kyk4vprv",
+    "version": "111.0.5563.147",
+    "sha256": "0absyydskz59pxicq4z468sr0cxcmrcanx0yk4lla9hvs05lx7f4",
    "sha256bin64": null,
    "deps": {
      "gn": {
@ -56,8 +56,8 @@
        "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
      },
      "ungoogled-patches": {
-        "rev": "111.0.5563.111-1",
-        "sha256": "1m8kf8af5zjc5mgdccppyfbl6bxlwcnb6rw58q5020a810x7y6f8"
+        "rev": "111.0.5563.147-1",
+        "sha256": "1ynnwrjjdwjlhzpc51rl03dv10bn4dxvwxvd29jksf5brwcr9bzb"
      }
    }
  }
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , cmake
 , pkg-config
@ -18,23 +17,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lagrange";
-  version = "1.15.6";
+  version = "1.15.7";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-V9zrwSAflatGcN5cOOzHyyW73FN3rU+l5xUlPwy8Huk=";
+    hash = "sha256-p6L2Ak8QaRsSs2/Xjbbod9UFy79vjO5C+YcArofe2Ck=";
  };

-  patches = [
-    # https://github.com/skyjake/lagrange/issues/589
-    (fetchpatch {
-      url = "https://github.com/skyjake/lagrange/commit/e8a4dad6930d16aa0811d04d06432cd6b59b472e.patch";
-      hash = "sha256-60YPmZPalnoo9AjwqKpswHkKAM/hKSIOapgPwSi4Qzk=";
-    })
-  ];
-
  nativeBuildInputs = [ cmake pkg-config zip ];

  buildInputs = [ the-foundation ]
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "cilium-cli";
-  version = "0.12.11";
+  version = "0.13.2";

  src = fetchFromGitHub {
    owner = "cilium";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-50D3iH5KAWvX7lAPHY7cUKc4d4ww47ti2QOgdrfY1BY=";
+    sha256 = "sha256-K/RUEr9WJU1tocESvBF48F890vMgCRANM0lqn644eeg=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  subPackages = [ "cmd/cilium" ];

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

 buildGoModule rec {
  pname = "eks-node-viewer";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "awslabs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-utn0OJX3NLCyAV4F01GIkvh/KFPv7vfLQMwso7x7yCw";
+    sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8=";
  };

-  vendorSha256 = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A";
+  vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A=";

  meta = with lib; {
    description = "Tool to visualize dynamic node usage within a cluster";
--- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
+++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
@ -13,16 +13,16 @@

 buildGoModule rec {
  pname = "chart-testing";
-  version = "3.7.1";
+  version = "3.8.0";

  src = fetchFromGitHub {
    owner = "helm";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
+    hash = "sha256-ccP3t+Q4aZviYw8by2JDiuKHt7o6EKFxBxlhEntmV5A=";
  };

-  vendorHash = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
+  vendorHash = "sha256-4x/8uDCfrERC+ww+iyP+dHIQ820IOARXj60KnjqeDkM=";

  postPatch = ''
    substituteInPlace pkg/config/config.go \
--- a/pkgs/applications/networking/cluster/k3s/1_26/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix
@ -47,10 +47,10 @@
 # Those pieces of software we entirely ignore upstream's handling of, and just
 # make sure they're in the path if desired.
 let
-  k3sVersion = "1.26.2+k3s1";     # k3s git tag
-  k3sCommit = "ea094d1d497b26538b61b5cbc27c1a4a1f2f3f24"; # k3s git commit at the above version
-  k3sRepoSha256 = "13jrxr0imgkwl7bay4rrq9iv7ipak9hlmn82x9shr63hihlw7z9l";
-  k3sVendorSha256 = "sha256-4uIOjHStU/DZk6YBdfC0F4L9z+csekMTjENJKpMmgx0=";
+  k3sVersion = "1.26.3+k3s1";     # k3s git tag
+  k3sCommit = "01ea3ff27be0b04f945179171cec5a8e11a14f7b"; # k3s git commit at the above version
+  k3sRepoSha256 = "1wpciikmr4l2nw92i3wlz301vxjiyz8rlzkn8jhzcaiifykc565s";
+  k3sVendorSha256 = "sha256-1HFLj3zSHV7RvA0fsQ/dPzwnkSRqE9TXXDA4m8OhwZE=";

  # nix generated by update.sh
  # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
@ -67,8 +67,8 @@ let
  k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";

  # taken from ./scripts/version.sh VERSION_CONTAINERD
-  containerdVersion = "1.6.15-k3s1";
-  containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd";
+  containerdVersion = "1.6.19-k3s1";
+  containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr";

  # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
  criCtlVersion = "1.26.0-rc.0-k3s1";
--- a/pkgs/applications/networking/cluster/kaniko/default.nix
+++ b/pkgs/applications/networking/cluster/kaniko/default.nix
@ -47,7 +47,7 @@ buildGoModule rec {
    homepage = "https://github.com/GoogleContainerTools/kaniko";
    license = lib.licenses.asl20;
    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ jk superherointj ];
+    maintainers = with lib.maintainers; [ jk ];
    mainProgram = "executor";
  };
 }
--- a/pkgs/applications/networking/cluster/kyverno/default.nix
+++ b/pkgs/applications/networking/cluster/kyverno/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kyverno";
-  version = "1.9.1";
+  version = "1.9.2";

  src = fetchFromGitHub {
    owner = "kyverno";
    repo = "kyverno";
    rev = "v${version}";
-    sha256 = "sha256-FHSvouD/7jZ70O3td6HLqXlOhMDbKPwqTy41Xwijyk4=";
+    sha256 = "sha256-R+08s8oQ/ZbaDwyYBshtot+g9OM7XAM6wZPf287wngg=";
  };

  ldflags = [
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -28,13 +28,13 @@
    "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
  },
  "aiven": {
-    "hash": "sha256-wVgfT/1o5Hz7xbX3OOfjF2P5bhV7kPxnXZOU/3erRpk=",
+    "hash": "sha256-dOdq/At0aUTaivvm557sgPwxC9EfRBexYrtpri8tzg4=",
    "homepage": "https://registry.terraform.io/providers/aiven/aiven",
    "owner": "aiven",
    "repo": "terraform-provider-aiven",
-    "rev": "v4.1.3",
+    "rev": "v4.2.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-wz1Wy/4GI8/Wlu828RX7OE+XJHzCS/X45tW3Jb7Tx3E="
+    "vendorHash": "sha256-QDO/xE9ZK7+UscjVBV06BMGavExD248PhLIrDB5oROU="
  },
  "akamai": {
    "hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=",
@ -228,13 +228,13 @@
    "vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24="
  },
  "cloudfoundry": {
-    "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=",
+    "hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=",
    "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
    "owner": "cloudfoundry-community",
    "repo": "terraform-provider-cloudfoundry",
-    "rev": "v0.50.5",
+    "rev": "v0.50.6",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2ulAzgDBdcYTqGRmEL9+h9MglZ9bt5WRXzNP099g2kk="
+    "vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE="
  },
  "cloudinit": {
    "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=",
@ -382,11 +382,11 @@
    "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
  },
  "fastly": {
-    "hash": "sha256-FO6SXpFk/DxOvDszwYiftB65JVNoN90JG6JFc8zid50=",
+    "hash": "sha256-hJHErQ8vDY9c1uaqiLYdxBns3U3XvAGKsobH8fit4HI=",
    "homepage": "https://registry.terraform.io/providers/fastly/fastly",
    "owner": "fastly",
    "repo": "terraform-provider-fastly",
-    "rev": "v4.1.1",
+    "rev": "v4.1.2",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -820,13 +820,13 @@
    "vendorHash": null
  },
  "okta": {
-    "hash": "sha256-O4ZTGYM9r3XFzr2Nx/Tt2Fs7WOqQuQWfo+ZMmZyg+mo=",
+    "hash": "sha256-j4tOWcY3x4FpfCEdB7x5XP7Pqms97tYtEvGDn8Fjst8=",
    "homepage": "https://registry.terraform.io/providers/okta/okta",
    "owner": "okta",
    "repo": "terraform-provider-okta",
-    "rev": "v3.44.0",
+    "rev": "v3.45.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-KYOzbbBjE2C7+1St62rs9mlJFhpIlWQJ0reh5V5tQsk="
+    "vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM="
  },
  "oktaasa": {
    "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@ -1099,11 +1099,11 @@
    "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
  },
  "tencentcloud": {
-    "hash": "sha256-N6x3CKpLL62lc+V038740EGBicjroc07KhkvyCYgn24=",
+    "hash": "sha256-Lf6IKNdl7eiFBdCSbuXaawMno7grlIQBwM99sg75sS0=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.79.18",
+    "rev": "v1.79.19",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -168,8 +168,8 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.4.2";
-    hash = "sha256-0CxB9VOrRoudJVK96mpuQ6etsI+F2dMh4NQTKQXec9c=";
+    version = "1.4.4";
+    hash = "sha256-Fg9NDV063gWi9Na144jjkK7E8ysE2GR4IYT6qjTgnqw=";
    vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "dnscontrol";
-  version = "3.29.0";
+  version = "3.29.1";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-G6vDHnHb7IYQZxSZTBOTDcTcVB8LTvFCBB9Um7TWqdA=";
+    sha256 = "sha256-sfmdOwwB3X3GFTg7NNAh7mi+fu4YZy9+c5Co3qaVo1o=";
  };

  vendorHash = "sha256-nOgb8UNDhumMyYu1v55qflYrU9HE8cWSGdfLqIAm/w4=";
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@ -3,16 +3,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "newsboat";
-  version = "2.30.1";
+  version = "2.31";

  src = fetchFromGitHub {
    owner = "newsboat";
    repo = "newsboat";
    rev = "r${version}";
-    hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro=";
+    hash = "sha256-e06QsfcAo/iYlvtdYZ8hX0EIMCDcwRrsJGjUxCrthUo=";
  };

-  cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78";
+  cargoHash = "sha256-MJkiC+UoiO4DiSvHLAklBdla+RmMYaxA/8oXNblYMF4=";

  # TODO: Check if that's still needed
  postPatch = lib.optionalString stdenv.isDarwin ''
@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec {

  meta = with lib; {
    homepage    = "https://newsboat.org/";
+    changelog   = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";
    description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console";
    maintainers = with maintainers; [ dotlambda nicknovitski ];
    license     = licenses.mit;
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@ -17,16 +17,20 @@ python3.pkgs.buildPythonApplication {
  src = fetchFromGitHub {
    owner = "GNS3";
    repo = "gns3-server";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
    sha256 = sha256Hash;
  };

-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "psutil==" "psutil>=" \
-      --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \
-      --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk"
-  '';
+  pythonRelaxDeps = [
+    "aiofiles"
+    "jsonschema"
+    "psutil"
+    "sentry-sdk"
+  ];
+
+  nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
+  ];

  propagatedBuildInputs = with python3.pkgs; [
    aiofiles
--- a/pkgs/applications/networking/instant-messengers/qq/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qq/default.nix
@ -20,15 +20,15 @@
 }:

 let
-  version = "3.1.0-9572";
+  version = "3.1.1-11223";
  srcs = {
    x86_64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb";
-      sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb";
+      sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY=";
    };
    aarch64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb";
-      sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb";
+      sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs=";
    };
  };
  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-vkcapture";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "nowrep";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-xtIcIT9lWw73Et9WgyEUznwy1X947Rv5nTiM+t0qYaM=";
+    hash = "sha256-4rEUA8V5WgAVyBeUT0ALVmj14HaAgeASYd2YiBn8MC0=";
  };

  cmakeFlags = lib.optionals stdenv.isi686 [
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@ -6,17 +6,18 @@
 , installShellFiles
 , util-linux
 , nixosTests
+, kubernetes
 }:

 buildGoModule rec {
  pname = "containerd";
-  version = "1.6.19";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "containerd";
    repo = "containerd";
    rev = "v${version}";
-    hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8=";
+    hash = "sha256-OHgakSNqIbXYDC7cTw2fy0HlElQMilDbSD5SSjbYJhc=";
  };

  vendorHash = null;
@ -42,7 +43,7 @@ buildGoModule rec {
    runHook postInstall
  '';

-  passthru.tests = { inherit (nixosTests) docker; };
+  passthru.tests = { inherit (nixosTests) docker; } // kubernetes.tests;

  meta = with lib; {
    changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}";
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "cri-o";
-  version = "1.26.2";
+  version = "1.26.3";

  src = fetchFromGitHub {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw=";
+    sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw=";
  };
  vendorSha256 = null;

--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "2.17.0";
+  version = "2.17.2";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    rev = "v${version}";
-    sha256 = "sha256-4gKVKnAMuwDv+PYbfFjl+8lO2ObuRb2Iflz5Xa/SNgA=";
+    sha256 = "sha256-cPvbPvrTUMN/JYGXLat2obsulicCn0uasPdiRxtuJRg=";
  };

  postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
    rm -rf e2e/
  '';

-  vendorHash = "sha256-xvyIEOyRCpd6xshyMMaRWQczhUVvI5wIN91wVpbT65s=";
+  vendorHash = "sha256-XQZZEfS9ZrR/JKa11YWowsWhO8f4MVBmGkDhptMs43E=";

  ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@ -41,13 +41,13 @@

 stdenv.mkDerivation rec {
  pname = "open-vm-tools";
-  version = "12.1.5";
+  version = "12.2.0";

  src = fetchFromGitHub {
    owner = "vmware";
    repo = "open-vm-tools";
    rev = "stable-${version}";
-    hash = "sha256-CffJg29qM9ex1RAq5t2dE/GX8ud9TylQbYiwBkh8nxE=";
+    hash = "sha256-ikodKEvlg+QU0af8IjiMjhMyQSV6icHVUczf0rWfVaI=";
  };

  sourceRoot = "${src.name}/open-vm-tools";
--- a/pkgs/applications/virtualization/podman-desktop/default.nix
+++ b/pkgs/applications/virtualization/podman-desktop/default.nix
@ -0,0 +1,120 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchYarnDeps
+, yarn
+, fixup_yarn_lock
+, nodejs
+, makeWrapper
+, copyDesktopItems
+, desktopToDarwinBundle
+, electron
+, makeDesktopItem
+}:
+
+stdenv.mkDerivation (self: {
+  pname = "podman-desktop";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "podman-desktop";
+    rev = "v${self.version}";
+    sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI=";
+  };
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${self.src}/yarn.lock";
+    sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA=";
+  };
+
+  patches = [
+    # podman should be installed with nix; disable auto-installation
+    ./patches/extension-no-download-podman.patch
+    ./patches/fix-yarn-lock-deterministic.patch
+  ];
+
+  postPatch = ''
+    for file in packages/main/src/tray-animate-icon.ts extensions/podman/src/util.ts packages/main/src/plugin/certificates.ts; do
+      substituteInPlace "$file" \
+        --replace 'process.resourcesPath'          "'$out/share/lib/podman-desktop/resources'" \
+        --replace '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'"
+    done
+  '';
+
+  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  nativeBuildInputs = [
+    yarn
+    fixup_yarn_lock
+    nodejs
+    makeWrapper
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    desktopToDarwinBundle
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    export HOME="$TMPDIR"
+    yarn config --offline set yarn-offline-mirror "$offlineCache"
+    fixup_yarn_lock yarn.lock
+    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
+    patchShebangs node_modules/
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn --offline run build
+    yarn --offline run electron-builder --dir \
+      --config .electron-builder.config.cjs \
+      -c.electronDist=${electron}/lib/electron \
+      -c.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/share/lib/podman-desktop"
+    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop"
+
+    install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"
+
+    makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \
+      --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  # see: https://github.com/containers/podman-desktop/blob/main/.flatpak.desktop
+  desktopItems = [
+    (makeDesktopItem {
+      name = "podman-desktop";
+      exec = "podman-desktop %U";
+      icon = "podman-desktop";
+      desktopName = "Podman Desktop";
+      genericName = "Desktop client for podman";
+      comment = self.meta.description;
+      categories = [ "Utility" ];
+      startupWMClass = "Podman Desktop";
+    })
+  ];
+
+  meta = with lib; {
+    description = "A graphical tool for developing on containers and Kubernetes";
+    homepage = "https://podman-desktop.io";
+    changelog = "https://github.com/containers/podman-desktop/releases/tag/v${self.version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ panda2134 ];
+    inherit (electron.meta) platforms;
+  };
+})
--- a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch
+++ b/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch
@ -0,0 +1,13 @@
+diff --git a/extensions/podman/package.json b/extensions/podman/package.json
+index 5f86bbe9..92c0ef3b 100644
+--- a/extensions/podman/package.json
+++ b/extensions/podman/package.json
+@@ -86,7 +86,7 @@
+     }
+   },
+   "scripts": {
+-    "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && npx ts-node ./scripts/download.ts  && node ./scripts/build.js",
+    "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && node ./scripts/build.js",
+     "watch": "rollup --bundleConfigAsCjs --config rollup.config.js -w",
+     "test": "vitest run --passWithNoTests"
+   },
--- a/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch
+++ b/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch
@ -0,0 +1,13 @@
+diff --git a/yarn.lock b/yarn.lock
+index ae340d04..5acc3fed 100644
+--- a/yarn.lock
+++ b/yarn.lock
+@@ -12753,7 +12753,7 @@ ws@^7.3.1:
+   resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"
+   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+ 
+-ws@^8.11.0, ws@^8.4.2:
+ws@^8.11.0, ws@^8.12.0, ws@^8.4.2:
+   version "8.12.0"
+   resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8"
+   integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
@ -1,5 +1,6 @@
 # Inherit arguments from the derivation
-makeWrapperArgs=( ${makeWrapperArgs-} )
+declare -a derivationMakeWrapperArgs="( ${makeWrapperArgs-} )"
+makeWrapperArgs=( "${derivationMakeWrapperArgs[@]}" )

 # First argument is the executable you want to wrap,
 # the second is the destination for the wrapper.
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@ -511,8 +511,8 @@ rec {
      ''
        mkdir -p $out
        for i in $(cat $pathsPath); do
-          ${lndir}/bin/lndir $i $out
-        done 2>&1 | sed 's/^/symlinkJoin: warning: keeping existing file: /'
+          ${lndir}/bin/lndir -silent $i $out
+        done
        ${postBuild}
      '';

--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@ -94,9 +94,8 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Color emoji font with a flat visual style, designed and used by Twitter";
    longDescription = ''
-      A bitmap color emoji font built from the Twitter Emoji for
-      Everyone artwork with support for ZWJ, skin tone diversity and country
-      flags.
+      A bitmap color emoji font built from Twitter's Twemoji emoji set
+      with support for ZWJ, skin tone diversity and country flags.

      This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
    '';
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "marwaita";
-  version = "16.2";
+  version = "17";

  src = fetchFromGitHub {
    owner = "darkomarko42";
    repo = pname;
    rev = version;
-    sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE=";
+    sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE=";
  };

  buildInputs = [
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix
@ -0,0 +1,140 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, dtkwidget
+, qt5integration
+, qt5platform-plugins
+, dde-qt-dbus-factory
+, deepin-pw-check
+, udisks2-qt5
+, cmake
+, qttools
+, qtbase
+, pkg-config
+, qtx11extras
+, qtmultimedia
+, wrapQtAppsHook
+, wrapGAppsHook
+, gsettings-qt
+, wayland
+, kwayland
+, qtwayland
+, polkit-qt
+, pcre
+, xorg
+, libselinux
+, libsepol
+, libxcrypt
+, librsvg
+, networkmanager-qt
+, glib
+, runtimeShell
+, tzdata
+, dbus
+, gtest
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dde-control-center";
+  version = "5.6.3";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-/gzS+IbopIDRpufsa9cEfFBOqehPUnF4IozvwW8UEbY=";
+  };
+
+  patches = [
+    # UserExperienceProgramLicenseAgreement comes from a non-open source component(deepin-deepinid-client)
+    # If we don't block it, only an empty page will be displayed here
+    # Remove this patch when dde-control-center is upgraded to 6.0.0
+    ./dont-show-endUserLicenseAgreement-for-deepinos.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace src/frame/window/{mainwindow.cpp,insertplugin.cpp} com.deepin.controlcenter.develop.policy \
+      --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center"
+
+    substituteInPlace src/frame/modules/datetime/timezone_dialog/timezone.cpp \
+      --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+
+    substituteInPlace src/frame/modules/accounts/accountsworker.cpp \
+      --replace "/bin/bash" "${runtimeShell}"
+
+    substituteInPlace dde-control-center-autostart.desktop \
+      --replace "/usr" "$out"
+
+    substituteInPlace com.deepin.dde.ControlCenter.service \
+      --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \
+      --replace "/usr/share" "$out/share"
+
+    substituteInPlace include/widgets/utils.h src/{reboot-reminder-dialog/main.cpp,frame/main.cpp,reset-password-dialog/main.cpp} \
+      --replace "/usr/share/dde-control-center" "$out/share/dde-control-center"
+
+    substituteInPlace dde-control-center-wapper \
+      --replace "qdbus" "${qttools.bin}/bin/qdbus" \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    qttools
+    pkg-config
+    wrapQtAppsHook
+    wrapGAppsHook
+  ];
+  dontWrapGApps = true;
+
+  buildInputs = [
+    dtkwidget
+    qt5platform-plugins
+    dde-qt-dbus-factory
+    deepin-pw-check
+    qtbase
+    qtx11extras
+    qtmultimedia
+    gsettings-qt
+    udisks2-qt5
+    wayland
+    kwayland
+    qtwayland
+    polkit-qt
+    pcre
+    xorg.libXdmcp
+    libselinux
+    libsepol
+    libxcrypt
+    librsvg
+    networkmanager-qt
+    gtest
+  ];
+
+  cmakeFlags = [
+    "-DCVERSION=${version}"
+    "-DDISABLE_AUTHENTICATION=YES"
+    "-DDISABLE_ACTIVATOR=YES"
+    "-DDISABLE_SYS_UPDATE=YES"
+    "-DDISABLE_RECOVERY=YES"
+  ];
+
+  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
+  qtWrapperArgs = [
+    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}"
+  ];
+
+  preFixup = ''
+    glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    description = "Control panel of Deepin Desktop Environment";
+    homepage = "https://github.com/linuxdeepin/dde-control-center";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = teams.deepin.members;
+  };
+}
--- a/pkgs/desktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch
+++ b/pkgs/desktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch
@ -0,0 +1,29 @@
+From adcc5eb58e2dcd06810a40c237bc7984c2c5af4b Mon Sep 17 00:00:00 2001
+From: rewine <luhongxu@deepin.org>
+Date: Sun, 8 Jan 2023 13:46:17 +0800
+Subject: [PATCH] dont show endUserLicenseAgreement for deepinos
+
+---
+ src/frame/window/modules/systeminfo/systeminfowidget.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
+index 8e62604fb..0f443ee20 100644
+--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp
+++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
+@@ -78,6 +78,12 @@ void SystemInfoWidget::initData()
+                 m_listView->setRowHidden(i, true);
+             }
+         }
+
+        if (IsNotDeepinUos) {
+            if (m.gsettingsName == "endUserLicenseAgreement") {
+                m_listView->setRowHidden(i, true);
+            }
+        }
+     }
+ 
+     if (InsertPlugin::instance()->updatePluginInfo("systeminfo"))
+-- 
+2.38.1
+
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@ -30,6 +30,7 @@ let
    udisks2-qt5 = callPackage ./library/udisks2-qt5 { };

    #### CORE
+    dde-control-center = callPackage ./core/dde-control-center { };
    dde-calendar = callPackage ./core/dde-calendar { };
    dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
    dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
--- a/pkgs/development/beam-modules/erlfmt/default.nix
+++ b/pkgs/development/beam-modules/erlfmt/default.nix
@ -2,12 +2,12 @@

 rebar3Relx rec {
  pname = "erlfmt";
-  version = "1.1.0";
+  version = "1.2.0";
  releaseType = "escript";
  src = fetchFromGitHub {
    owner = "WhatsApp";
    repo = "erlfmt";
-    sha256 = "sha256-diZCyw4eR+h/Pc73HDfnFaXnNXwqu3XabTbeiWVPNPI=";
+    sha256 = "sha256-mma4QH6GlayTG5I9hW9wNZph/IJcCXjiY7Ft3hfxaPg=";
    rev = "v${version}";
  };
  meta = with lib; {
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@ -14,7 +14,6 @@ assert if type == "sdk" then packages != null else true;
 , autoPatchelfHook
 , makeWrapper
 , libunwind
-, openssl_1_1
 , icu
 , libuuid
 , zlib
@ -61,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: rec {
    zlib
    icu
    libkrb5
-    # this must be before curl for autoPatchElf to find it
-    # curl brings in its own openssl
-    openssl_1_1
    curl
  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12;

--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@ -28,7 +28,9 @@
 let
  # Stage 1
  # Base
-  llvm = callPackage ./llvm.nix { };
+  llvm = callPackage ./llvm.nix {
+    isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344
+  };

  # Projects
  clang-unwrapped = callPackage ./llvm.nix rec {
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -103,7 +103,7 @@ stdenv.mkDerivation (rec {
    description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
    homepage = "https://www.ponylang.org";
    license = licenses.bsd2;
-    maintainers = with maintainers; [ kamilchm patternspandemic redvers superherointj ];
+    maintainers = with maintainers; [ kamilchm patternspandemic redvers ];
    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
  };
 })
--- a/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/pkgs/development/compilers/ponyc/pony-corral.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation ( rec {
    homepage = "https://www.ponylang.io";
    changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md";
    license = licenses.bsd2;
-    maintainers = with maintainers; [ redvers superherointj ];
+    maintainers = with maintainers; [ redvers ];
    platforms = [ "x86_64-linux" "x86_64-darwin" ];
  };
 })
--- a/pkgs/development/coq-modules/HoTT/default.nix
+++ b/pkgs/development/coq-modules/HoTT/default.nix
@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, autoconf, automake, coq, version ? null }:
+{ lib, mkCoqDerivation, coq, version ? null }:

 mkCoqDerivation {
  pname = "HoTT";
@ -6,20 +6,41 @@ mkCoqDerivation {
  owner = "HoTT";
  inherit version;
  defaultVersion = with lib.versions; lib.switch coq.coq-version [
-    { case = range "8.14" "8.16"; out = coq.coq-version; }
+    { case = range "8.14" "8.17"; out = coq.coq-version; }
  ] null;
  releaseRev = v: "V${v}";
-  release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY=";
-  release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g=";
  release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0=";
+  release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g=";
+  release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY=";
+  release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8=";

+  # versions of HoTT for Coq 8.17 and onwards will use dune
+  # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null;
+  opam-name = "coq-hott";
+  useDune = lib.versions.isGe "8.17" coq.coq-version;
+  
  patchPhase = ''
    patchShebangs etc
  '';

  meta = {
    homepage = "https://homotopytypetheory.org/";
-    description = "Homotopy type theory";
-    maintainers = with lib.maintainers; [ siddharthist ];
+    description = "The Homotopy Type Theory library";
+    longDescription = ''
+      Homotopy Type Theory is an interpretation of Martin-Löf’s intensional
+      type theory into abstract homotopy theory. Propositional equality is
+      interpreted as homotopy and type isomorphism as homotopy equivalence.
+      Logical constructions in type theory then correspond to
+      homotopy-invariant constructions on spaces, while theorems and even
+      proofs in the logical system inherit a homotopical meaning. As the
+      natural logic of homotopy, type theory is also related to higher
+      category theory as it is used e.g. in the notion of a higher topos.
+
+      The HoTT library is a development of homotopy-theoretic ideas in the Coq
+      proof assistant. It draws many ideas from Vladimir Voevodsky's
+      Foundations library (which has since been incorporated into the Unimath
+      library) and also cross-pollinates with the HoTT-Agda library.
+    '';
+    maintainers = with lib.maintainers; [ alizter siddharthist ];
  };
 }
--- a/pkgs/development/coq-modules/mathcomp-apery/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-apery/default.nix
@ -0,0 +1,23 @@
+{ coq, mkCoqDerivation, mathcomp, coqeal, mathcomp-real-closed,
+  mathcomp-bigenough, mathcomp-zify, mathcomp-algebra-tactics,
+  lib, version ? null }:
+
+mkCoqDerivation {
+
+  pname = "apery";
+
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ]  [
+      { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; }
+    ] null;
+
+  release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY=";
+
+  propagatedBuildInputs = [ mathcomp.field coqeal mathcomp-real-closed
+    mathcomp-bigenough mathcomp-zify mathcomp-algebra-tactics ];
+
+  meta = {
+    description = "A formally verified proof in Coq, by computer algebra, that ζ(3) is irrational";
+    license = lib.licenses.cecill-c;
+  };
+}
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@ -112,14 +112,6 @@ let
              sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";
            })
          ]
-          ++ ops (ver.majMin == "3.1") [
-            # Ruby 3.1.3 cannot find pkg-config in mkmf.rb
-            # https://bugs.ruby-lang.org/issues/19189
-            (fetchpatch {
-              url = "https://github.com/ruby/ruby/commit/613fca01486e47dee9364a2fd86b5f5e77fe23c8.patch";
-              sha256 = "sha256-0Ku7l6VEpcvxexL9QA5+mNER4v8gYZOJhAjhCL1WDpw=";
-            })
-          ]
          ++ ops (!atLeast30 && rubygemsSupport) [
            # We upgrade rubygems to a version that isn't compatible with the
            # ruby 2.7 installer. Backport the upstream fix.
@ -322,23 +314,23 @@ in {
  mkRuby = generic;

  ruby_2_7 = generic {
-    version = rubyVersion "2" "7" "7" "";
-    sha256 = "sha256-4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A=";
+    version = rubyVersion "2" "7" "8" "";
+    sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";
  };

  ruby_3_0 = generic {
-    version = rubyVersion "3" "0" "5" "";
-    sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y=";
+    version = rubyVersion "3" "0" "6" "";
+    sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4=";
  };

  ruby_3_1 = generic {
-    version = rubyVersion "3" "1" "3" "";
-    sha256 = "sha256-XqSYo19M0Vh1IApS3eQrbrF54SZOF9eHMsOlfNHGq54=";
+    version = rubyVersion "3" "1" "4" "";
+    sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";
  };

  ruby_3_2 = generic {
-    version = rubyVersion "3" "2" "1" "";
-    sha256 = "sha256-E9Z5AWYO4yF9vZ3VYFk0a9QhLOZKacMG71LfZJNfjb0=";
+    version = rubyVersion "3" "2" "2" "";
+    sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=";
    cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";
  };
 }
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@ -170,6 +170,6 @@ stdenv.mkDerivation rec {
    homepage = "http://www.libsdl.org/";
    license = licenses.zlib;
    platforms = platforms.all;
-    maintainers = with maintainers; [ cpages superherointj ];
+    maintainers = with maintainers; [ cpages ];
  };
 }
--- a/pkgs/development/libraries/cctag/cmake-install-include-dir.patch
+++ b/pkgs/development/libraries/cctag/cmake-install-include-dir.patch
@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -209,7 +209,7 @@
+   target_include_directories(CCTag
+                            PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
+                                   "$<BUILD_INTERFACE:${generated_dir}>"
+-                                  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>"
+                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+                            PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
+ 
+   # just for testing
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+
+, cmake
+, boost
+, eigen
+, opencv
+, tbb
+
+, avx2Support ? stdenv.hostPlatform.avx2Support
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cctag";
+  version = "1.0.3";
+
+  outputs = [ "lib" "dev" "out" ];
+
+  src = fetchFromGitHub {
+    owner = "alicevision";
+    repo = "CCTag";
+    rev = "v${version}";
+    hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
+  };
+
+  cmakeFlags = [
+    # Feel free to create a PR to add CUDA support
+    "-DCCTAG_WITH_CUDA=OFF"
+
+    "-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"
+
+    "-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DCCTAG_BUILD_APPS=OFF"
+  ];
+
+  patches = [
+    ./cmake-install-include-dir.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    tbb
+  ];
+
+  buildInputs = [
+    boost
+    eigen
+    opencv
+  ];
+
+  # Tests are broken on Darwin (linking issue)
+  doCheck = !stdenv.isDarwin;
+
+  meta = with lib; {
+    description = "Detection of CCTag markers made up of concentric circles";
+    homepage = "https://cctag.readthedocs.io";
+    downloadPage = "https://github.com/alicevision/CCTag";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ tmarkus ];
+  };
+}
--- a/pkgs/development/libraries/litehtml/default.nix
+++ b/pkgs/development/libraries/litehtml/default.nix
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
    hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ=";
  };

+  # Don't search for non-existant gumbo cmake config
+  # This will mislead cmake that litehtml is not found
+  # Affects build of pkgs that depend on litehtml
+  postPatch = ''
+    substituteInPlace cmake/litehtmlConfig.cmake \
+      --replace "find_dependency(gumbo)" ""
+  '';
+
  nativeBuildInputs = [
    cmake
  ];
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "openxr-loader";
-  version = "1.0.26";
+  version = "1.0.27";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "OpenXR-SDK-Source";
    rev = "release-${version}";
-    sha256 = "sha256-Ou6IwCvRJE4pB/69Sjmc5fZPMvjaDvPOs0Qgol9rTEA=";
+    sha256 = "sha256-QvwSNuIph/ea3dAGQ0VhOiOmPmQtnqleCEebRpH2SgE=";
  };

  nativeBuildInputs = [ cmake python3 pkg-config ];
--- a/pkgs/development/libraries/psol/default.nix
+++ b/pkgs/development/libraries/psol/default.nix
@ -1,11 +1,22 @@
-{ fetchzip, lib }:
+{ lib, stdenvNoCC, fetchurl }:

-fetchzip rec {
+stdenvNoCC.mkDerivation rec {
  pname = "psol";
  version = "1.13.35.2"; # Latest stable, 2018-02-05

-  url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
-  sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
+  src = fetchurl {
+    url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
+    hash = "sha256-3zujyPxU4ThF0KHap6bj2YMSbCORKFG7+Lo1vmRqQ08=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv include lib -t $out
+
+    runHook postInstall
+  '';

  meta = with lib; {
    description = "PageSpeed Optimization Libraries";
--- a/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/pkgs/development/libraries/rocm-thunk/default.nix
@ -12,7 +12,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-thunk";
-  version = "5.4.3";
+  version = "5.4.4";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
--- a/pkgs/development/libraries/rocsolver/default.nix
+++ b/pkgs/development/libraries/rocsolver/default.nix
@ -17,7 +17,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocsolver";
-  version = "5.4.2";
+  version = "5.4.4";

  outputs = [
    "out"
--- a/pkgs/development/libraries/science/chemistry/dftd4/default.nix
+++ b/pkgs/development/libraries/science/chemistry/dftd4/default.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace $out/lib/pkgconfig/${pname}.pc \
-      --replace "''${prefix}" ""
+      --replace "''${prefix}/" ""
  '';

  doCheck = true;
--- a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix
+++ b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace $out/lib/pkgconfig/${pname}.pc \
-      --replace "''${prefix}" ""
+      --replace "''${prefix}/" ""
  '';

  doCheck = true;
--- a/pkgs/development/libraries/science/chemistry/mstore/default.nix
+++ b/pkgs/development/libraries/science/chemistry/mstore/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace $out/lib/pkgconfig/${pname}.pc \
-      --replace "''${prefix}" ""
+      --replace "''${prefix}/" ""
  '';

  meta = with lib; {
--- a/pkgs/development/libraries/science/chemistry/multicharge/default.nix
+++ b/pkgs/development/libraries/science/chemistry/multicharge/default.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace $out/lib/pkgconfig/${pname}.pc \
-      --replace "''${prefix}" ""
+      --replace "''${prefix}/" ""
  '';

  doCheck = true;
--- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
+++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace $out/lib/pkgconfig/s-dftd3.pc \
-      --replace "''${prefix}" ""
+      --replace "''${prefix}/" ""
  '';

  doCheck = true;
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Reimplementation of the DFT-D3 program";
-    license = with licenses; [lgpl3Only gpl3Only];
+    license = with licenses; [ lgpl3Only gpl3Only ];
    homepage = "https://github.com/dftd3/simple-dftd3";
    platforms = [ "x86_64-linux" ];
    maintainers = [ maintainers.sheepforce ];
--- a/pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch
+++ b/pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch
@ -0,0 +1,31 @@
+From 1885a2349102742e33c5c97a8ab4bcacc032fc70 Mon Sep 17 00:00:00 2001
+From: Ryan Swart <ryan@talosystems.com>
+Date: Thu, 30 Mar 2023 15:50:23 +0800
+Subject: [PATCH] fix: multicharge dep needed for static compilation
+
+---
+ config/meson.build | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/config/meson.build b/config/meson.build
+index 4f76160..629fa5e 100644
+--- a/config/meson.build
+++ b/config/meson.build
+@@ -136,6 +136,14 @@ sdftd3_dep = dependency(
+ )
+ lib_deps += sdftd3_dep
+ 
+# Create multicharge library as subproject
+multicharge_dep = dependency(
+  'multicharge',
+  fallback: ['multicharge'],
+  default_options: ['default_library=static', 'api=false', 'python=false'],
+)
+lib_deps += multicharge_dep
+
+ # Create TOML Fortran as subproject
+ tomlf_dep = dependency(
+   'toml-f',
+-- 
+2.39.2
+
--- a/pkgs/development/libraries/science/chemistry/tblite/python.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix
@ -3,24 +3,54 @@
 , ninja
 , pkg-config
 , tblite
+, numpy
+, simple-dftd3
 , cffi
+, gfortran
+, blas
+, lapack
+, mctc-lib
+, mstore
+, toml-f
+, multicharge
+, dftd4
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  inherit (tblite) pname version src meta;

-  nativeBuildInputs = [ meson ninja pkg-config ];
+  nativeBuildInputs = [
+    tblite
+    meson
+    ninja
+    pkg-config
+    gfortran
+    mctc-lib
+  ];

-  buildInputs = [ tblite ];
+  buildInputs = [
+    tblite
+    simple-dftd3
+    blas
+    lapack
+    mctc-lib
+    mstore
+    toml-f
+    multicharge
+    dftd4
+  ];

-  propagatedBuildInputs = [ cffi ];
+  propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ];
+
+  # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors
+  patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ];

  format = "other";
-
+  pythonImportsCheck = [ "tblite" "tblite.interface" ];
  configurePhase = ''
    runHook preConfigure

-    meson setup build python --prefix=$out
+    meson setup build -Dpython=true --prefix=$out
    cd build

    runHook postConfigure
--- a/pkgs/development/misc/cppreference-doc/default.nix
+++ b/pkgs/development/misc/cppreference-doc/default.nix
@ -1,22 +1,23 @@
-{ lib, fetchzip }:
+{ lib, stdenvNoCC, fetchurl }:

-let
+stdenvNoCC.mkDerivation rec {
  pname = "cppreference-doc";
-  version = "2022.07.30";
-  ver = builtins.replaceStrings ["."] [""] version;
+  version = "20220730";

-in fetchzip {
-  name = pname + "-" + version;
+  src = fetchurl {
+    url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz";
+    hash = "sha256-cfFQA8FouNxaAMuvGbZICps+h6t+Riqjnttj11EcAos=";
+  };

-  url = "https://github.com/PeterFeicht/${pname}/releases/download/v${ver}/html-book-${ver}.tar.xz";
-  sha256 = "sha256-gsYNpdxbWnmwcC9IJV1g+e0/s4Hoo5ig1MGoYPIHspw=";
+  sourceRoot = ".";

-  stripRoot = false;
+  installPhase = ''
+    runHook preInstall

-  postFetch = ''
-    rm $out/cppreference-doxygen-local.tag.xml $out/cppreference-doxygen-web.tag.xml
    mkdir -p $out/share/cppreference/doc
-    mv $out/reference $out/share/cppreference/doc/html
+    mv reference $out/share/cppreference/doc/html
+
+    runHook postInstall
  '';

  passthru = { inherit pname version; };
--- a/pkgs/development/misc/h3/default.nix
+++ b/pkgs/development/misc/h3/default.nix
@ -2,32 +2,52 @@
 , stdenv
 , cmake
 , fetchFromGitHub
+, static ? stdenv.hostPlatform.isStatic
 }:

-stdenv.mkDerivation rec {
-  pname = "h3";
-  version = "3.7.2";
+let
+  generic = { version, hash }:
+    stdenv.mkDerivation rec {
+      inherit version;
+      pname = "h3";

-  src = fetchFromGitHub {
-    owner = "uber";
-    repo = "h3";
-    rev = "v${version}";
-    sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";
+      src = fetchFromGitHub {
+        owner = "uber";
+        repo = "h3";
+        rev = "v${version}";
+        inherit hash;
+      };
+
+      nativeBuildInputs = [ cmake ];
+
+      cmakeFlags = [
+        "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+        "-DBUILD_BENCHMARKS=OFF"
+        "-DBUILD_FUZZERS=OFF"
+        "-DBUILD_GENERATORS=OFF"
+        "-DENABLE_COVERAGE=OFF"
+        "-DENABLE_FORMAT=OFF"
+        "-DENABLE_LINTING=OFF"
+      ];
+
+      meta = with lib; {
+        homepage = "https://h3geo.org/";
+        description = "Hexagonal hierarchical geospatial indexing system";
+        license = licenses.asl20;
+        changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md";
+        platforms = platforms.all;
+        maintainers = with maintainers; [ kalbasit marsam ];
+      };
+    };
+in
+{
+  h3_3 = generic {
+    version = "3.7.2";
+    hash = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";
  };

-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DENABLE_LINTING=OFF"
-  ];
-
-  meta = with lib; {
-    homepage = "https://h3geo.org/";
-    description = "Hexagonal hierarchical geospatial indexing system";
-    license = licenses.asl20;
-    changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md";
-    platforms = platforms.all;
-    maintainers = [ maintainers.kalbasit ];
+  h3_4 = generic {
+    version = "4.1.0";
+    hash = "sha256-7qyN73T8XDwZLgMZld7wwShUwoLEi/2gN2oiZX8n5nQ=";
  };
 }
--- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
@ -1,24 +1,22 @@
-{ lib, buildDunePackage, ocaml, fetchurl
-, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config
+{ lib, buildDunePackage, fetchurl
+, alcotest, pkg-config
 }:

 buildDunePackage rec {
  pname = "bigarray-overlap";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchurl {
-    url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz";
-    sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy";
+    url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-${version}.tbz";
+    hash = "sha256-L1IKxHAFTjNYg+upJUvyi2Z23bV3U8+1iyLPhK4aZuA=";
  };

-  minimumOCamlVersion = "4.07";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

-  propagatedBuildInputs = [ bigarray-compat ];
-
-  nativeBuildInputs = [ findlib pkg-config ];
-  checkInputs = [ alcotest astring fpath bos ];
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  nativeBuildInputs = [ pkg-config ];
+  checkInputs = [ alcotest ];
+  doCheck = true;

  meta = with lib; {
    homepage = "https://github.com/dinosaure/overlap";
--- a/pkgs/development/ocaml-modules/mm/default.nix
+++ b/pkgs/development/ocaml-modules/mm/default.nix
@ -4,7 +4,7 @@

 buildDunePackage rec {
  pname = "mm";
-  version = "0.8.2";
+  version = "0.8.3";

  duneVersion = "3";

@ -14,7 +14,7 @@ buildDunePackage rec {
    owner = "savonet";
    repo = "ocaml-mm";
    rev = "v${version}";
-    sha256 = "sha256-EifM96MWIDyr1EVUZYuISWGwbMshVQppzWLJchqzV2E=";
+    sha256 = "sha256-pL1e7U5EtbI8bVum7mMHUD8QFMV4jc3YFjhTOvR43kg=";
  };

  buildInputs = [ dune-configurator ];
--- a/pkgs/development/ocaml-modules/reason-native/default.nix
+++ b/pkgs/development/ocaml-modules/reason-native/default.nix
@ -1,23 +1,23 @@
-{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:
+{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }:

 let
  generic = (somePath:
    let
      prepkg = import somePath {
-        inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;
+        inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch;
        inherit (reason-native) console file-context-printer fp pastel rely;
      };
    in
      buildDunePackage
        ({
-          version = "2021-16-16-aec0ac6";
+          version = "2022-08-31-a0ddab6";
          src = fetchFromGitHub {
            owner = "reasonml";
            repo = "reason-native";
-            rev = "aec0ac681be7211b4d092262281689c46deb63e1";
-            sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";
+            rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a";
+            hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8=";
          };
-          useDune2 = true;
+          duneVersion = "3";
          meta = with lib; {
            description = "Libraries for building and testing native Reason programs";
            downloadPage = "https://github.com/reasonml/reason-native";
@ -36,6 +36,7 @@ in
    fp = generic ./fp.nix;
    pastel = generic ./pastel.nix;
    pastel-console = generic ./pastel-console.nix;
+    qcheck-rely = generic ./qcheck-rely.nix;
    refmterr = generic ./refmterr.nix;
    rely = generic ./rely.nix;
    rely-junit-reporter = generic ./rely-junit-reporter.nix;
--- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
+++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
@ -0,0 +1,31 @@
+{ qcheck-core, reason, console, rely, fetchpatch, ... }:
+
+{
+  pname = "qcheck-rely";
+
+  nativeBuildInputs = [
+    reason
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch";
+      hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4=";
+      includes = [
+        "src/qcheck-rely/QCheckRely.re"
+        "src/qcheck-rely/QCheckRely.rei"
+      ];
+    })
+  ];
+
+  propagatedBuildInputs = [
+    qcheck-core
+    console
+    rely
+  ];
+
+  meta = {
+    description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
+    downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
+  };
+}
--- a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
+++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
@ -6,7 +6,7 @@ buildDunePackage rec {

  src = ./.;

-  useDune2 = true;
+  duneVersion = "3";

  buildInputs = [
    reason
--- a/pkgs/development/ocaml-modules/srt/default.nix
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@ -6,13 +6,16 @@

 buildDunePackage rec {
  pname = "srt";
-  version = "0.2.1";
+  version = "0.3.0";
+
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchFromGitHub {
    owner = "savonet";
    repo = "ocaml-srt";
    rev = "v${version}";
-    sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g=";
+    sha256 = "sha256-iD18bCbouBuMpuSzruDZJoYz2YyN080RK8BavUF3beY=";
  };

  buildInputs = [ dune-configurator ];
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@ -10,16 +10,16 @@

 buildPythonPackage rec {
  pname = "aiofiles";
-  version = "22.1.0";
+  version = "23.1.0";
  format = "pyproject";

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "Tinche";
    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss=";
  };

  nativeBuildInputs = [
@ -45,10 +45,10 @@ buildPythonPackage rec {
    "aiofiles"
  ];

-  meta = {
+  meta = with lib; {
    description = "File support for asyncio";
    homepage = "https://github.com/Tinche/aiofiles";
-    license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ fridh ];
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fridh ];
  };
 }
--- a/pkgs/development/python-modules/aiomysensors/default.nix
+++ b/pkgs/development/python-modules/aiomysensors/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "aiomysensors";
-  version = "0.3.6";
+  version = "0.3.9";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-oYYr7LuTvw7e99930vF7odl2dWA/QPOTEW02l8cqXlc=";
+    hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE=";
  };

  nativeBuildInputs = [
@ -58,6 +58,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Library to connect to MySensors gateways";
    homepage = "https://github.com/MartinHjelmare/aiomysensors";
+    changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "aliyun-python-sdk-cdn";
-  version = "3.8.3";
+  version = "3.8.5";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-LsB3u35PLI/3PcuNbdgcxRoEFZ5CpyINEJa4Nw64NPA=";
+    hash = "sha256-2bFiOvwbvYy7uw7h0LTX4szSBwgafSYOOixxv+zAYDo=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@ -4,6 +4,8 @@
 , uvloop
 , postgresql
 , pythonOlder
+, pytest-xdist
+, pytestCheckHook
 }:

 buildPythonPackage rec {
@ -24,8 +26,14 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    uvloop
    postgresql
+    pytest-xdist
+    pytestCheckHook
  ];

+  preCheck = ''
+    rm -rf asyncpg/
+  '';
+
  pythonImportsCheck = [
    "asyncpg"
  ];
@ -33,6 +41,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Asyncio PosgtreSQL driver";
    homepage = "https://github.com/MagicStack/asyncpg";
+    changelog = "https://github.com/MagicStack/asyncpg/releases/tag/v${version}";
    longDescription = ''
      Asyncpg is a database interface library designed specifically for
      PostgreSQL and Python/asyncio. asyncpg is an efficient, clean
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@ -58,6 +58,7 @@ buildPythonPackage rec {
  pythonRelaxDeps = [
    "gremlinpython"
    "numpy"
+    "openpyxl"
    "pandas"
    "pg8000"
    "pyarrow"
--- a/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix
@ -0,0 +1,38 @@
+{ azure-common
+, azure-mgmt-core
+, buildPythonPackage
+, fetchPypi
+, lib
+, msrest
+, msrestazure
+}:
+
+buildPythonPackage rec {
+  pname = "azure-mgmt-frontdoor";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "sha256-nJXQ/BpyOwmybNUqE4cBxq5xxZE56lqgHSTKZTIHIuU=";
+  };
+
+  propagatedBuildInputs = [
+    msrest
+    msrestazure
+    azure-common
+    azure-mgmt-core
+  ];
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "azure.mgmt.frontdoor" ];
+
+  meta = with lib; {
+    description = "Microsoft Azure Front Door Service Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
--- a/pkgs/development/python-modules/dicom-numpy/default.nix
+++ b/pkgs/development/python-modules/dicom-numpy/default.nix
@ -24,7 +24,7 @@ buildPythonPackage rec {
    pydicom
  ];

-  checkInputs = [
+  nativeCheckInputs = [
    pytestCheckHook
  ];

--- a/pkgs/development/python-modules/django-ckeditor/default.nix
+++ b/pkgs/development/python-modules/django-ckeditor/default.nix
@ -0,0 +1,60 @@
+{ lib
+, buildPythonPackage
+, django
+, django-js-asset
+, fetchFromGitHub
+, python
+, setuptools-scm
+, django-extensions
+, selenium
+, pillow
+}:
+
+buildPythonPackage rec {
+  pname = "django-ckeditor";
+  version = "6.5.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "django-ckeditor";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-Gk8mAG0WIMQZolaE1sRDmzSkfiNHi/BWiotEtIC4WLk=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    django
+    django-js-asset
+    pillow
+  ];
+
+  DJANGO_SETTINGS_MODULE = "ckeditor_demo.settings";
+
+  checkInputs = [
+    django-extensions
+    selenium
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m django test
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [
+    "ckeditor"
+  ];
+
+  meta = with lib; {
+    description = " Django admin CKEditor integration";
+    homepage = "https://github.com/django-ckeditor/django-ckeditor";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ onny ];
+  };
+}
--- a/pkgs/development/python-modules/django-pattern-library/default.nix
+++ b/pkgs/development/python-modules/django-pattern-library/default.nix
@ -0,0 +1,55 @@
+{ beautifulsoup4
+, buildPythonPackage
+, django
+, fetchFromGitHub
+, lib
+, markdown
+, poetry-core
+, python
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "django-pattern-library";
+  version = "1.0.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "torchbox";
+    rev = "v${version}";
+    sha256 = "sha256-V299HpbfNLa9cpVhBfzD41oe95xqh+ktQVMMVvm5Xao=";
+  };
+
+  propagatedBuildInputs = [
+    django
+    pyyaml
+    markdown
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+    --replace poetry.masonry.api poetry.core.masonry.api
+  '';
+
+  nativeBuildInputs = [ poetry-core ];
+
+  checkInputs = [
+    beautifulsoup4
+  ];
+
+  checkPhase = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings.dev
+    ${python.interpreter} -m django test
+  '';
+
+  pythonImportsCheck = [ "pattern_library" ];
+
+  meta = with lib; {
+    description = "UI pattern libraries for Django templates";
+    homepage = "https://github.com/torchbox/django-pattern-library/";
+    changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
--- a/pkgs/development/python-modules/draftjs-exporter/default.nix
+++ b/pkgs/development/python-modules/draftjs-exporter/default.nix
@ -0,0 +1,45 @@
+{ beautifulsoup4
+, buildPythonPackage
+, fetchFromGitHub
+, html5lib
+, lib
+, lxml
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "draftjs-exporter";
+  version = "2.1.7";
+
+  src = fetchFromGitHub {
+    repo = "draftjs_exporter";
+    owner = "springload";
+    rev = "v${version}";
+    sha256 = "sha256-tw0r9RnQdIwcY+pqnW8fcV0o2LzmxW0MZPn5drNgK80=";
+  };
+
+  passthru.optional-dependencies = {
+    lxml = [ lxml ];
+    html5lib = [ beautifulsoup4 html5lib ];
+  };
+
+  checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib;
+
+  checkPhase = ''
+    # 2 tests in this file randomly fail because they depend on the order of
+    # HTML attributes
+    rm tests/test_exports.py
+
+    ${python.interpreter} -m unittest discover
+  '';
+
+  pythonImportsCheck = [ "draftjs_exporter" ];
+
+  meta = with lib; {
+    description = "Library to convert Draft.js ContentState to HTML";
+    homepage = "https://github.com/springload/draftjs_exporter";
+    changelog = "https://github.com/springload/draftjs_exporter/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@ -6,11 +6,12 @@
 , rfc3987
 , ruamel-yaml
 , setuptools-scm
+, libfdt
 }:

 buildPythonPackage rec {
  pname = "dtschema";
-  version = "2022.01";
+  version = "2022.12";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,9 +20,14 @@ buildPythonPackage rec {
    owner = "devicetree-org";
    repo = "dt-schema";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wwlXIM/eO3dII/qQpkAGLT3/15rBLi7ZiNtqYFf7Li4=";
+    sha256 = "sha256-+wF6WdonZrkZEnlq/P6QeT3X7CMinxbapLa7q0t2zUc=";
  };

+  patches = [
+    # Change name of pylibfdt to libfdt
+    ./fix_libfdt_name.patch
+  ];
+
  SETUPTOOLS_SCM_PRETEND_VERSION = version;

  nativeBuildInputs = [
@ -32,6 +38,7 @@ buildPythonPackage rec {
    jsonschema
    rfc3987
    ruamel-yaml
+    libfdt
  ];

  # Module has no tests
--- a/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch
+++ b/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch
@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 62db8af..4a980c1 100755
+--- a/setup.py
+++ b/setup.py
+@@ -52,7 +52,7 @@ setuptools.setup(
+         'ruamel.yaml>0.15.69',
+         'jsonschema>=4.1.2',
+         'rfc3987',
+-        'pylibfdt',
+        'libfdt',
+     ],
+ 
+     classifiers=[
--- a/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/pkgs/development/python-modules/farama-notifications/default.nix
@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "farama-notifications";
+  version = "0.0.4";
+
+  src = fetchFromGitHub {
+    owner = "Farama-Foundation";
+    repo = pname;
+    rev = version;
+    hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ setuptools ];
+
+  pythonImportsCheck = [ "farama_notifications" ];
+
+  meta = with lib; {
+    description = "Allows for providing notifications on import to all Farama Packages";
+    homepage = "https://github.com/Farama-Foundation/Farama-Notifications";
+    license = licenses.mit;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "fastcore";
-  version = "1.5.28";
+  version = "1.5.29";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "fastai";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY=";
+    hash = "sha256-yCPOF150TdkPHfLl8Jo2oow+91IzRKgnXo3eQMn5wK0=";
  };

  propagatedBuildInputs = [
@ -34,6 +34,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python module for Fast AI";
    homepage = "https://github.com/fastai/fastcore";
+    changelog = "https://github.com/fastai/fastcore/blob/${version}/CHANGELOG.md";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/formulaic/default.nix
+++ b/pkgs/development/python-modules/formulaic/default.nix
@ -48,7 +48,7 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "formulaic" ];

-  checkInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];

  disabledTestPaths = [
    "tests/transforms/test_poly.py"
--- a/pkgs/development/python-modules/gdown/default.nix
+++ b/pkgs/development/python-modules/gdown/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "gdown";
-  version = "4.6.4";
+  version = "4.7.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k=";
+    hash = "sha256-NH8jdpZ5qvfvpz5WVScPzajKVr5l64Skoh0UOYlUEEU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-org-policy";
-  version = "1.8.0";
+  version = "1.8.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ylUUxWLe5u1WVyz1rD64u9MJ7qKsLl3cLD4ELcZCI6Y=";
+    hash = "sha256-JVXRVq7yrRLj15ZMKVCBvCsrRP8KcRj9XNvfeH0rXVc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-trace";
-  version = "1.11.0";
+  version = "1.11.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k=";
+    hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@ -31,7 +31,8 @@ buildPythonPackage rec {

    substituteInPlace setup.py \
      --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \
-      --replace 'importlib-metadata<5.0.0' 'importlib-metadata'
+      --replace 'importlib-metadata<5.0.0' 'importlib-metadata' \
+      --replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"'
  '';

  # setup-requires requirements
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, numpy
+, cloudpickle
+, gym-notices
+, jax-jumpy
+, typing-extensions
+, farama-notifications
+, importlib-metadata
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "gymnasium";
+  version = "0.28.1";
+
+  src = fetchFromGitHub {
+    owner = "Farama-Foundation";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-7rRF21H3IxbgmqxvtC370kr0exLgfg3e2tA3J49xuao=";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ setuptools ];
+
+  propagatedBuildInputs = [
+    jax-jumpy
+    cloudpickle
+    numpy
+    gym-notices
+    typing-extensions
+    farama-notifications
+  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+
+  pythonImportsCheck = [ "gymnasium" ];
+
+  meta = with lib; {
+    description = "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)";
+    homepage = "https://github.com/Farama-Foundation/Gymnasium";
+    license = licenses.mit;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/iceportal/default.nix
+++ b/pkgs/development/python-modules/iceportal/default.nix
@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry-core
+, httpx
+, pytest-asyncio
+, pytest-httpx
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "iceportal";
+  version = "1.1.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-ecosystem";
+    repo = "python-iceportal";
+    rev = "refs/tags/${version}";
+    hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    httpx
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-httpx
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "iceportal"
+  ];
+
+  meta = with lib; {
+    description = "Library for getting data from the ICE Portal";
+    homepage = "https://github.com/home-assistant-ecosystem/python-iceportal";
+    changelog = "https://github.com/home-assistant-ecosystem/python-iceportal/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/Show More
+++ b/Show More