Merge master into haskell-updates

2023-02-25 00:14:08 +00:00 · 2023-02-25 00:14:08 +00:00 · 359de95de5
commit 359de95de5
parent 9ace1d895c 665cbdb5e0
181 changed files with 1560 additions and 802 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -12882,6 +12882,12 @@
    githubId = 61306;
    name = "Rene Treffer";
  };
+  rubyowo = {
+    name = "Rei Star";
+    email = "perhaps-you-know@what-is.ml";
+    github = "rubyowo";
+    githubId = 105302757;
+  };
  rumpelsepp = {
    name = "Stefan Tatschner";
    email = "stefan@rumpelsepp.org";
@ -15343,6 +15349,11 @@
    github = "unrooted";
    githubId = 30440603;
  };
+  unsolvedcypher = {
+    name = "Matthew M";
+    github = "UnsolvedCypher";
+    githubId = 3170853;
+  };
  uralbash = {
    email = "root@uralbash.ru";
    github = "uralbash";
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@ -461,7 +461,9 @@ in
    # If requested enable modesetting via kernel parameter.
    boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
      ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
-      ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1";
+      ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
+      # proprietary driver is not compiled with support for X86_KERNEL_IBT
+      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off";

    services.udev.extraRules =
      ''
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -1168,6 +1168,7 @@
  ./services/web-apps/moodle.nix
  ./services/web-apps/netbox.nix
  ./services/web-apps/nextcloud.nix
+  ./services/web-apps/nextcloud-notify_push.nix
  ./services/web-apps/nexus.nix
  ./services/web-apps/nifi.nix
  ./services/web-apps/node-red.nix
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@ -0,0 +1,96 @@
+{ config, options, lib, pkgs, ... }:
+
+let
+  cfg = config.services.nextcloud.notify_push;
+in
+{
+  options.services.nextcloud.notify_push = {
+    enable = lib.mkEnableOption (lib.mdDoc "Notify push");
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.nextcloud-notify_push;
+      defaultText = lib.literalMD "pkgs.nextcloud-notify_push";
+      description = lib.mdDoc "Which package to use for notify_push";
+    };
+
+    socketPath = lib.mkOption {
+      type = lib.types.str;
+      default = "/run/nextcloud-notify_push/sock";
+      description = lib.mdDoc "Socket path to use for notify_push";
+    };
+
+    logLevel = lib.mkOption {
+      type = lib.types.enum [ "error" "warn" "info" "debug" "trace" ];
+      default = "error";
+      description = lib.mdDoc "Log level";
+    };
+  } // (
+    lib.genAttrs [
+      "dbtype"
+      "dbname"
+      "dbuser"
+      "dbpassFile"
+      "dbhost"
+      "dbport"
+      "dbtableprefix"
+    ] (
+      opt: options.services.nextcloud.config.${opt} // {
+        default = config.services.nextcloud.config.${opt};
+        defaultText = "config.services.nextcloud.config.${opt}";
+      }
+    )
+  );
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.nextcloud-notify_push = let
+      nextcloudUrl = "http${lib.optionalString config.services.nextcloud.https "s"}://${config.services.nextcloud.hostName}";
+    in {
+      description = "Push daemon for Nextcloud clients";
+      documentation = [ "https://github.com/nextcloud/notify_push" ];
+      after = [ "phpfpm-nextcloud.service" ];
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        NEXTCLOUD_URL = nextcloudUrl;
+        SOCKET_PATH = cfg.socketPath;
+        DATABASE_PREFIX = cfg.dbtableprefix;
+        LOG = cfg.logLevel;
+      };
+      postStart = ''
+        ${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push
+      '';
+      script = let
+        dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype;
+        dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser;
+        dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD";
+        isSocket = lib.hasPrefix "/" (toString cfg.dbhost);
+        dbHost = lib.optionalString (cfg.dbhost != null) (if
+          isSocket then
+            if dbType == "postgresql" then "?host=${cfg.dbhost}" else
+            if dbType == "mysql" then "?socket=${cfg.dbhost}" else throw "unsupported dbtype"
+          else
+            "@${cfg.dbhost}");
+        dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}";
+        dbUrl = "${dbType}://${dbUser}${dbPass}${lib.optionalString (!isSocket) dbHost}${dbName}${lib.optionalString isSocket dbHost}";
+      in lib.optionalString (dbPass != "") ''
+        export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")"
+      '' + ''
+        export DATABASE_URL="${dbUrl}"
+        ${cfg.package}/bin/notify_push --glob-config '${config.services.nextcloud.datadir}/config/config.php'
+      '';
+      serviceConfig = {
+        User = "nextcloud";
+        Group = "nextcloud";
+        RuntimeDirectory = [ "nextcloud-notify_push" ];
+        Restart = "on-failure";
+        RestartSec = "5s";
+      };
+    };
+
+    services.nginx.virtualHosts.${config.services.nextcloud.hostName}.locations."^~ /push/" = {
+      proxyPass = "http://unix:${cfg.socketPath}";
+      proxyWebsockets = true;
+      recommendedProxySettings = true;
+    };
+  };
+}
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@ -13,7 +13,7 @@ in {
    # The only thing the client needs to do is download a file.
    client = { ... }: {};

-    nextcloud = { config, pkgs, ... }: {
+    nextcloud = { config, pkgs, lib, ... }: {
      networking.firewall.allowedTCPPorts = [ 80 ];

      services.nextcloud = {
@ -34,6 +34,15 @@ in {
          adminpassFile = toString (pkgs.writeText "admin-pass-file" ''
            ${adminpass}
          '');
+          trustedProxies = [ "::1" ];
+        };
+        notify_push = {
+          enable = true;
+          logLevel = "debug";
+        };
+        extraAppsEnable = true;
+        extraApps = {
+          inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push;
        };
      };

@ -94,8 +103,10 @@ in {
        "${withRcloneEnv} ${copySharedFile}"
    )
    client.wait_for_unit("multi-user.target")
+    client.execute("${pkgs.nextcloud-notify_push.passthru.test_client}/bin/test_client http://nextcloud ${adminuser} ${adminpass} >&2 &")
    client.succeed(
        "${withRcloneEnv} ${diffSharedFile}"
    )
+    nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"")
  '';
 })) args
--- a/pkgs/applications/audio/cardinal/default.nix
+++ b/pkgs/applications/audio/cardinal/default.nix
@ -2,6 +2,9 @@
  stdenv
 , fetchFromGitHub
 , fetchurl
+, cmake
+, dbus
+, file
 , freetype
 , jansson
 , lib
@ -11,32 +14,44 @@
 , libXext
 , libXrandr
 , libarchive
+, libjack2
 , liblo
 , libsamplerate
-, mesa
+, libsndfile
+, makeWrapper
 , pkg-config
 , python3
 , speexdsp
+, libglvnd
 }:

 stdenv.mkDerivation rec {
  pname = "cardinal";
-  version = "22.11";
+  version = "22.12";

  src = fetchurl {
    url =
      "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
-    sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0=";
+    sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY=";
  };

  prePatch = ''
    patchShebangs ./dpf/utils/generate-ttl.sh
  '';

+  dontUseCmakeConfigure = true;
  enableParallelBuilding = true;
+  strictDeps = true;

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    file
+    pkg-config
+    makeWrapper
+    python3
+  ];
  buildInputs = [
+    dbus
    freetype
    jansson
    libGL
@ -44,18 +59,25 @@ stdenv.mkDerivation rec {
    libXcursor
    libXext
    libXrandr
-    libXrandr
    libarchive
    liblo
    libsamplerate
-    mesa
-    python3
+    libsndfile
    speexdsp
+    libglvnd
  ];

  hardeningDisable = [ "format" ];
  makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];

+  postInstall = ''
+    wrapProgram $out/bin/Cardinal \
+    --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}
+
+    # this doesn't work and is mainly just a test tool for the developers anyway.
+    rm -f $out/bin/CardinalNative
+  '';
+
  meta = {
    description = "Plugin wrapper around VCV Rack";
    homepage = "https://github.com/DISTRHO/cardinal";
--- a/pkgs/applications/audio/termusic/default.nix
+++ b/pkgs/applications/audio/termusic/default.nix
@ -1,23 +1,42 @@
 { lib
 , stdenv
-, fetchCrate
 , rustPlatform
+, fetchCrate
+, fetchpatch
 , pkg-config
-, alsa-lib }:
+, alsa-lib
+, darwin
+}:

 rustPlatform.buildRustPackage rec {
  pname = "termusic";
-  version = "0.7.8";
+  version = "0.7.9";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ=";
+    hash = "sha256-ytAKINcZwLyHWbzShxfxRKx4BepM0G2BYdLgwR48g7w=";
  };

-  cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78=";
+  cargoHash = "sha256-yxFF5Yqj+xTB3FAJUtgcIeAEHR44JA1xONxGFdG0yS0=";

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ alsa-lib ];
+  patches = [
+    (fetchpatch {
+      name = "fix-panic-when-XDG_AUDIO_DIR-not-set.patch";
+      url = "https://github.com/tramhao/termusic/commit/b6006b22901f1f865a2e3acf7490fd3fa520ca5e.patch";
+      hash = "sha256-1ukQ0y5IRdOndsryuqXI9/zyhCDQ5NIeTan4KCynAv0=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = lib.optionals stdenv.isLinux [
+    alsa-lib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AudioUnit
+  ];

  meta = with lib; {
    description = "Terminal Music Player TUI written in Rust";
--- a/pkgs/applications/emulators/desmume/default.nix
+++ b/pkgs/applications/emulators/desmume/default.nix
@ -6,6 +6,7 @@
 , agg
 , alsa-lib
 , desktop-file-utils
+, wrapGAppsHook
 , gtk3
 , intltool
 , libGLU
@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeBuildInputs = [
+    wrapGAppsHook
    desktop-file-utils
    intltool
    libtool
--- a/pkgs/applications/misc/ablog/default.nix
+++ b/pkgs/applications/misc/ablog/default.nix
@ -6,11 +6,11 @@ with python3.pkgs;

 buildPythonApplication rec {
  pname = "ablog";
-  version = "0.10.33";
+  version = "0.10.33.post1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU=";
+    sha256 = "sha256-+vrVQ4sItCXrSCzNXyKk6/6oDBOyfyD7iNWzmcbE/BQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@ -8,13 +8,13 @@

 mkDerivation rec {
  pname = "heimer";
-  version = "3.6.4";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "juzzlin";
    repo = pname;
    rev = version;
-    hash = "sha256-hKVBPSWIbKXMEmk9C7k+3NBqLwYybN6Jql9qigIx4jE=";
+    hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
  };

-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [
    "-Wno-old-style-cast"
    "-Wno-error"
    "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
-  ];
+  ]);

  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";

--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@ -46,11 +46,11 @@ let
  inherit (python3.pkgs) paramiko pycairo pyodbc;
 in stdenv.mkDerivation rec {
  pname = "mysql-workbench";
-  version = "8.0.30";
+  version = "8.0.32";

  src = fetchurl {
    url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
-    sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185";
+    sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";
  };

  patches = [
@ -148,7 +148,7 @@ in stdenv.mkDerivation rec {
    "-Wno-error=narrowing"
  ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
    # Needed with GCC 12 but problematic with some old GCCs
-    "-Wno-error=maybe-uninitalized"
+    "-Wno-error=maybe-uninitialized"
  ]);

  cmakeFlags = [
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@ -90,11 +90,11 @@ in

 stdenv.mkDerivation rec {
  pname = "brave";
-  version = "1.48.158";
+  version = "1.48.171";

  src = fetchurl {
    url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY=";
+    sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps=";
  };

  dontConfigure = true;
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "110.0.5481.100",
-    "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
-    "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
+    "version": "110.0.5481.177",
+    "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv",
+    "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2",
    "deps": {
      "gn": {
        "version": "2022-12-12",
@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "111.0.5563.19",
-    "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
-    "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza",
+    "version": "111.0.5563.41",
+    "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay",
+    "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w",
    "deps": {
      "gn": {
        "version": "2022-12-12",
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -9,14 +9,14 @@
    "vendorHash": null
  },
  "acme": {
-    "hash": "sha256-iAUbGLxeN2Ntsq0mOWEKuvorIy7u+0kffzIqg+wF9gM=",
+    "hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=",
    "homepage": "https://registry.terraform.io/providers/vancluever/acme",
    "owner": "vancluever",
    "proxyVendor": true,
    "repo": "terraform-provider-acme",
-    "rev": "v2.13.0",
+    "rev": "v2.13.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-5gh3e5wPCBA87fHPXTT+hnrXIPVW5meKmT4pFP1ryOc="
+    "vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE="
  },
  "age": {
    "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@ -364,11 +364,11 @@
    "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
  },
  "exoscale": {
-    "hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=",
+    "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=",
    "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
    "owner": "exoscale",
    "repo": "terraform-provider-exoscale",
-    "rev": "v0.45.0",
+    "rev": "v0.46.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -802,11 +802,11 @@
  },
  "nutanix": {
    "deleteVendor": true,
-    "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=",
+    "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=",
    "homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
    "owner": "nutanix",
    "repo": "terraform-provider-nutanix",
-    "rev": "v1.7.1",
+    "rev": "v1.8.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
  },
@ -856,13 +856,13 @@
    "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
  },
  "opentelekomcloud": {
-    "hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=",
+    "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.33.0",
+    "rev": "v1.33.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU="
+    "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64="
  },
  "opsgenie": {
    "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@ -1099,11 +1099,11 @@
    "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="
  },
  "tencentcloud": {
-    "hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=",
+    "hash": "sha256-f6GdDTezh1lDNppCLmjx/7jiKsq2yZoR92kYpGAAldQ=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.79.10",
+    "rev": "v1.79.11",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -1117,11 +1117,11 @@
    "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU="
  },
  "thunder": {
-    "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
+    "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=",
    "homepage": "https://registry.terraform.io/providers/a10networks/thunder",
    "owner": "a10networks",
    "repo": "terraform-provider-thunder",
-    "rev": "v1.0.0",
+    "rev": "v1.1.0",
    "spdx": "BSD-2-Clause",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/pkgs/applications/networking/cluster/waypoint/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "waypoint";
-  version = "0.10.5";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-oUzWBFoBRwQynWubBzR9xNIyqRXTsH0R+OCyIDz0a9s=";
+    sha256 = "sha256-FI6QXQ0n/vvzUJTBbPDh9nMyAdcfTzpX79RxQEbFDUs=";
  };

-  vendorSha256 = "sha256-rmDxO1tfpCUh5TXsSmf3DMIqB0NQHuCyizZmnaoZox0=";
+  vendorHash = "sha256-t8PzimNW7JWvWU3lZHo+b5K3R6he35HhBQPu1hxK51U=";

  nativeBuildInputs = [ go-bindata installShellFiles ];

--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@ -2,7 +2,7 @@
 let
  versions = if stdenv.isLinux then {
    stable = "0.0.25";
-    ptb = "0.0.38";
+    ptb = "0.0.39";
    canary = "0.0.148";
  } else {
    stable = "0.0.264";
@ -18,7 +18,7 @@ let
      };
      ptb = fetchurl {
        url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s=";
+        sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks=";
      };
      canary = fetchurl {
        url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@ -46,7 +46,11 @@ let
    version = versions.linux;

    src = fetchurl {
-      url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb";
+      urls = [
+        "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"
+        # NOTE: the archive.org timestamp must also be updated if the version changes.
+        "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"
+      ];
      hash = hashes.linux;
    };

--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "morgen";
-  version = "2.6.4";
+  version = "2.6.6";

  src = fetchurl {
    url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
-    sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY=";
+    sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "fldigi";
-  version = "4.1.23";
+  version = "4.1.25";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-42bh/J/DQ/V9ORKKZgOmlvhyNR7UjbqPPD0Wi9ofyo0=";
+    sha256 = "sha256-TsS/OS2mXwqsk+E+9MEoETIHRWks8Hg/qw8WRmAxB2M=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@ -1,32 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+, boost
+}:

 stdenv.mkDerivation rec {
  pname = "cryptominisat";
-  version = "5.8.0";
+  version = "5.11.4";

  src = fetchFromGitHub {
-    owner  = "msoos";
-    repo   = "cryptominisat";
-    rev    = version;
-    sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
+    owner = "msoos";
+    repo = "cryptominisat";
+    rev = version;
+    hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc=";
  };

-  patches = [
-    (fetchpatch {
-      # https://github.com/msoos/cryptominisat/pull/621
-      url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch";
-      sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw";
-    })
-  ];
-
  buildInputs = [ python3 boost ];
-  nativeBuildInputs = [ cmake xxd ];
+  nativeBuildInputs = [ cmake ];

  meta = with lib; {
    description = "An advanced SAT Solver";
-    homepage    = "https://github.com/msoos/cryptominisat";
-    license     = licenses.mit;
+    homepage = "https://github.com/msoos/cryptominisat";
+    license = licenses.mit;
    maintainers = with maintainers; [ mic92 ];
-    platforms   = platforms.unix;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@ -26,12 +26,12 @@

 buildPythonApplication rec {
  pname = "streamlit";
-  version = "1.16.0";
+  version = "1.18.1";
  format = "wheel"; # source currently requires pipenv

  src = fetchPypi {
    inherit pname version format;
-    hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A=";
+    hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
      "-DUSE_OLDCMAKECUDA=ON"  # see https://github.com/apache/incubator-mxnet/issues/10743
      "-DCUDA_ARCH_NAME=All"
      "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
-      "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}"
+      "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}"
    ] else [ "-DUSE_CUDA=OFF" ])
    ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";

--- a/pkgs/applications/version-management/ghq/default.nix
+++ b/pkgs/applications/version-management/ghq/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "ghq";
-  version = "1.3.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "x-motemen";
    repo = "ghq";
    rev = "v${version}";
-    sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY=";
+    sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84=";
  };

-  vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM=";
+  vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs=";

  doCheck = false;

--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "smartgithg";
-  version = "22.1.3";
+  version = "22.1.4";

  src = fetchurl {
    url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
-    sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4=";
+    sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk=";
  };

  nativeBuildInputs = [ wrapGAppsHook ];
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@ -18,11 +18,11 @@

 buildPythonApplication rec {
  pname = "jellyfin-mpv-shim";
-  version = "2.3.1";
+  version = "2.4.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c=";
+    sha256 = "sha256-hz6uIzlVuocSZRDYLnJ3/OZ4UDNlavJFky4CuyggANI=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix
+++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
@ -3,11 +3,11 @@
 buildKodiAddon rec {
  pname = "arteplussept";
  namespace = "plugin.video.arteplussept";
-  version = "1.1.1";
+  version = "1.1.8";

  src = fetchzip {
    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To=";
+    hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI=";
  };

  propagatedBuildInputs = [
@ -23,7 +23,7 @@ buildKodiAddon rec {
  };

  meta = with lib; {
-    homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept";
+    homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept";
    description = "Watch videos available on Arte+7";
    license = licenses.mit;
    maintainers = teams.kodi.members;
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@ -20,13 +20,13 @@

 buildGoModule rec {
  pname = "podman";
-  version = "4.4.1";
+  version = "4.4.2";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "podman";
    rev = "v${version}";
-    hash = "sha256-Uha5ueOGNmG2f+1I89uFQKA3pSSp1d02FGy86Fc2eWE=";
+    hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ=";
  };

  patches = [
--- a/pkgs/build-support/mkshell/default.nix
+++ b/pkgs/build-support/mkshell/default.nix
@ -53,4 +53,6 @@ stdenv.mkDerivation ({
      export;
    } >> "$out"
  '';
+
+  preferLocalBuild = true;
 } // rest)
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@ -11,7 +11,7 @@ let
    (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "19.0.0";
+  version = "19.0.1";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@ -1,4 +1,4 @@
-{ callPackage, lib, fetchFromSourcehut }:
+{ lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }:

 let
  sets = [
@ -23,25 +23,40 @@ let
    sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
  };
  privateBuildPlan = src.outPath + "/private-build-plans.toml";
-  overrideAttrs = (attrs: {
-    inherit version;
-
-    meta = with lib; {
-      inherit (src.meta) homepage;
-      description = ''
-        Customised build of the Iosevka typeface, with a consistent
-        rounded style and overrides for almost all individual glyphs
-        in both roman (upright) and italic (slanted) variants.
-      '';
-      license = licenses.ofl;
-      platforms = attrs.meta.platforms;
-      maintainers = [ maintainers.DamienCassou ];
-    };
-  });
  makeIosevkaFont = set:
-    (callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs
-    overrideAttrs;
-in builtins.listToAttrs (builtins.map (set: {
-  name = set;
-  value = makeIosevkaFont set;
-}) sets)
+    let superBuildNpmPackage = buildNpmPackage; in
+    (iosevka.override rec {
+      inherit set privateBuildPlan;
+      buildNpmPackage = args: superBuildNpmPackage
+        (args // {
+          inherit version;
+
+          src = fetchFromGitHub {
+            owner = "be5invis";
+            repo = "iosevka";
+            rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77";
+            hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w=";
+          };
+
+          npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw=";
+
+          meta = with lib; {
+            inherit (src.meta) homepage;
+            description = ''
+              Customised build of the Iosevka typeface, with a consistent
+              rounded style and overrides for almost all individual glyphs
+              in both roman (upright) and italic (slanted) variants.
+            '';
+            license = licenses.ofl;
+            platforms = iosevka.meta.platforms;
+            maintainers = [ maintainers.DamienCassou ];
+          };
+        });
+    });
+in
+builtins.listToAttrs (builtins.map
+  (set: {
+    name = set;
+    value = makeIosevkaFont set;
+  })
+  sets)
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "0m8z67daj1gwb3yiw8qw3n1nxp96xb11fvb5183bh02r7ncym0da";
-  iosevka-aile = "02jhyzk3bpsjng3b1jfffwvr2inhhjsm4jdahzj05j381fp717c4";
-  iosevka-curly = "1si2kzv7qhlpyaaa954vnjmfk1c5rjxjimvckinpkjz30cnvg1bl";
-  iosevka-curly-slab = "1ngk3r6kdqngksga3s3m615jkqrxdcplj8srvlb6642vcc38w6vh";
-  iosevka-etoile = "1yg38x8dk5nyyjyy71v5j4x2x701hmp8gjwvphf5scf6vn52lvxz";
-  iosevka-slab = "1bw6lyy8lg4vpalnrsrnkrm9dlyl6vm6faigy2y9bfvh7nxrd8qa";
-  iosevka-ss01 = "1p02d8mdqx6mbnycs9d2r0qwqsxjrlgbl7skf8y66dsmjn6xxd0y";
-  iosevka-ss02 = "0ds8ad38h7h8250hdm89v2imya6jdzgk1h5jgsf983ls1gqjikhc";
-  iosevka-ss03 = "1s6rc4qhlfgvr7g8ywmlmsl58hfrqx0w24ivx5zz4jr5zqj70j7l";
-  iosevka-ss04 = "1lc8kx0p8m8nm4ql6ylcw9g4iq0j65hv6x48273cclqqcmqdn4qj";
-  iosevka-ss05 = "1wx02ysbj0rpr623jp1jy64ywrj8rm3n2fqzq05f4qv996bij11k";
-  iosevka-ss06 = "1bf0qnpvbq94d42gvbzikfkk20d788cicsyk8kz1vsf5xbg37kla";
-  iosevka-ss07 = "1ybl5gfyz4dnarimamshf002p9k6148wbbrbarpswb85kab502hd";
-  iosevka-ss08 = "1llp8iryr5dixdarwls9iw8mmnhzhlr7q8fzq969p64ygk76rkn4";
-  iosevka-ss09 = "14b49k0zv49xybdwrbf0p1krrga3jjviwzy0alxrwn0zf7vlbnbi";
-  iosevka-ss10 = "1xs1dkq62pml17dii2lhsianhzr22059i17sw2b334wbszc00j7y";
-  iosevka-ss11 = "0mrjzmk74vlq69ih4gm2iza4qdzyznn42bk3jwlvpd67z5vq36ag";
-  iosevka-ss12 = "0z16a8wrydi0ch9zj0lcz6cxbvawkr0ck03bzdbb81waggk4fxin";
-  iosevka-ss13 = "1rv8n3vbhwqv7bks6v86v4w13fr4a015xpvprzfz76xp98hb9dmc";
-  iosevka-ss14 = "0m7kpvy8bknmrfsql9b24w7n15hybnkisjxzzmrxkf8a60jrydni";
-  iosevka-ss15 = "006jkgww0hdb0c1wgby0y5535xapjpk1w8vm51d3yyrp04pwr1r1";
-  iosevka-ss16 = "1mmc7cyyk64lcavb2gib64b64zcr7qcn0m3cmlwnr1zgm6nb3w64";
-  iosevka-ss17 = "0wanv1h8qg5jyx7w380h7jkbc22slg9566pzw7dv7dg1nw0h2v3k";
-  iosevka-ss18 = "1y1daxghw3jbfn785935906j76l0230yixdmwlrzyra2svyaql3w";
-  sgr-iosevka = "182nzxxrxfz8xc3w8g9bsr0can71671w4xplyvyi7b1v9f62g9f5";
-  sgr-iosevka-aile = "1arjiwx5qf8j6pzb8mpd1g46z0kn80341wvcmsnx42d97b2m64jx";
-  sgr-iosevka-curly = "1lyh0rh2pswbaxsqyxicyknhla4gm2h0jb2rg0wx9vib9h53lazn";
-  sgr-iosevka-curly-slab = "0h2j7dwcyd5v1acpwjsz9li5g4r1ssx715x5pj4gdvskq4calff4";
-  sgr-iosevka-etoile = "15ag0w6sv24rc91mxh4c89gq6jwnq37bxml6a41rvn54fy0h1jnd";
-  sgr-iosevka-fixed = "0935zbk5x0mk06al11nig74b2rv1x8zc3waxs8hvbri0ryzykzk4";
-  sgr-iosevka-fixed-curly = "1i8cqfwcdsaxdlh87kaya8bp33fwlyz984r757122qnqbywcfm30";
-  sgr-iosevka-fixed-curly-slab = "0ba77jxn8n5dssjpwj4iyvwxw3mxqizrvsz5jyv9a4f3gfvwi18k";
-  sgr-iosevka-fixed-slab = "0qfhc7pg30ashpx504lln4h2w36icrbgij7fga07z2a715qxmfq9";
-  sgr-iosevka-fixed-ss01 = "1597hn4vzh0r8j22k7866blj3kw2bhp70z7msfr2hbszpscwxwqg";
-  sgr-iosevka-fixed-ss02 = "1ygrsvamgp6f26zg5qysk6dn4fa1im02dzsrlpgpv3sl4gh0cv44";
-  sgr-iosevka-fixed-ss03 = "0936ggnzaavqn4d7fsmmf54bwp0v31sz0n1w15ky7c5bsqp9h8ja";
-  sgr-iosevka-fixed-ss04 = "1xjslygh3f5nv0k8fiby0cgg22wr0a9jh79fbzallx3zh4d60a2a";
-  sgr-iosevka-fixed-ss05 = "0vnm398zdvkzymhw41gljpf9jq52wq3vawiyw5xsdr75d4n63fpb";
-  sgr-iosevka-fixed-ss06 = "1pnk8ijb193h85sk702ar0m0wk03xz1xcnvx8iq4k52q3a3vdd40";
-  sgr-iosevka-fixed-ss07 = "0qfcf6r2gzc5zwjfrcq1hjp9c5s13fc34lwwmxkj8224d42543jn";
-  sgr-iosevka-fixed-ss08 = "1ram9wm14k2sncfqpak23vss3pyqbwd1ndhm1i4ib7bpq8skd3wi";
-  sgr-iosevka-fixed-ss09 = "0r8zy1fwih42clxm2rsjqks5rxgy1qxirz396r25gvwxng2503y4";
-  sgr-iosevka-fixed-ss10 = "1v44s7n1gwz7mcybjsi1amv6xc8z47k20miycngjcy1cccrds2da";
-  sgr-iosevka-fixed-ss11 = "1fdclqvzq45shpj97awc7636ymgrnfd69iaizwxy49y2krpa7dx9";
-  sgr-iosevka-fixed-ss12 = "07f7i0qh9z6hlgy0ak3myxmiy4rbrixcap52lhk8wwapbnf21r7l";
-  sgr-iosevka-fixed-ss13 = "07z3hfi5vynwl15dqfsldwjj5i9fldmm6i1nypm28cxbya3izj60";
-  sgr-iosevka-fixed-ss14 = "1r001yna7ydf24bkgygld2kh47pvsz1yr9s57ssvdql37q24wzf1";
-  sgr-iosevka-fixed-ss15 = "1757lzbp9payykcdywdbfilhgm1yij8gsnazc7bywpc4sv806vhz";
-  sgr-iosevka-fixed-ss16 = "18mr7wvz5q60kgz0h2k05ahd0krz3ng7wgg1amd3292cji61vxvw";
-  sgr-iosevka-fixed-ss17 = "1bykqwspssv1vbx2nns8dfckijqmd633g57glmlhjmxlavv5gxnw";
-  sgr-iosevka-fixed-ss18 = "034w2yv2ihybkz03zalcsixrmjs7as62v8jhk8xkyckqc3bk0kc7";
-  sgr-iosevka-slab = "04b1w9ij6dgy5gyvi7d47g9xadpb230mlgbdrk36fyhvfyw048y1";
-  sgr-iosevka-ss01 = "077d4dan7f41ydi64xv0z0784j5vcj98vmqagmy1c1xyr0p68dac";
-  sgr-iosevka-ss02 = "1hmy2cwnsb3f60yp66lznas78432518xkj2jmpqy8ad05d2zmmc8";
-  sgr-iosevka-ss03 = "1bs1hb6magmbc2zh4fzx7h6j6bdllbvv85fv5krs3b888w3fzjw1";
-  sgr-iosevka-ss04 = "1c3wb8nz0xz57crwn151b5sgzm320jkirsajyjf0srdaid1gkjkx";
-  sgr-iosevka-ss05 = "1dx33y8rk3nzgdfikz262javq4v3n76hvv5b7rx7kxlkxycpy8ya";
-  sgr-iosevka-ss06 = "1s54xx4w3zvbz2w7f5sl5vlqazwsm033jsq8ljrdh4c2l88mpcq3";
-  sgr-iosevka-ss07 = "03zfq3jib2df6dhj1pbmw8hq57i0fx98gkawxzk13sfgrzz1zv47";
-  sgr-iosevka-ss08 = "09k220gha919lv18bs6y2zlcjqa5j7jsq8mfqx8xddcwq1v9v094";
-  sgr-iosevka-ss09 = "0plvxhqwkr52sich4kwzqs3xq5s5x61hq7n423ar2zaskx007sjv";
-  sgr-iosevka-ss10 = "0c42h417sir120cp6fbnbhv3s1ys8pxky56v6f44h50w7p6qhlx1";
-  sgr-iosevka-ss11 = "03sp7z0s5sb9bnhxb9liainpiqmq1r0lpmigscl6wr1rpaxq2l7i";
-  sgr-iosevka-ss12 = "0y2xs0qv3b1k4s4my9c69j94ql2kwmqmm3f626vjj8rar8r0wab0";
-  sgr-iosevka-ss13 = "1pyv3i1972n5gxr16fl68gydjsxndh7kbba3d15bmkankahgll6c";
-  sgr-iosevka-ss14 = "1c7y8h8jv937wnlxkgdswb0ixa5v747z598pd0yhvwid3ksxb1px";
-  sgr-iosevka-ss15 = "08wzzkr0l0xz4l7qk9kbhvybr4favl0qz0cjr7raw0hibqkw17sp";
-  sgr-iosevka-ss16 = "0q63x71mq19gqqiaqbqsp0lvf3knhckx5d17caq6ipv5gs3xxmzr";
-  sgr-iosevka-ss17 = "04054qbvyfvp1aqs3likyh85kqyckkg2ac83s65lvkj3f46r50sg";
-  sgr-iosevka-ss18 = "1ckrfx3f4mncm1hbc2bcsbk97kkzsi524wfgvhz10jw1yk5yyd60";
-  sgr-iosevka-term = "1ygfsc86fihkxpwm2q3j2y3ibpb7lkrjwrld7dg9ymb83hah29xm";
-  sgr-iosevka-term-curly = "1qz8x2z23m5yvdpf0055a7xb5z77dabwbf3hkmh4r77rp1h6idv4";
-  sgr-iosevka-term-curly-slab = "011n7qpcx2abvp5i9z6picy5bcjvvfx7pjqy8m7sf02fdm14s2jl";
-  sgr-iosevka-term-slab = "1iwgcqnxbjf25k6bbx3iwcqy2ghwnnxvfinjp5slwr7bhjjjbl9y";
-  sgr-iosevka-term-ss01 = "09s813a8ywqpncmq0iqkjjnh1sb5zn267fzp2dz92cmw5929627s";
-  sgr-iosevka-term-ss02 = "1yyvnxdwi6caq6b6pgviad5l7b7znx4xkxdg1np23a7imr94vb1c";
-  sgr-iosevka-term-ss03 = "1hrdipmf54z2hrl7g8m8z17aq3lp5v66xy24f58qsm4c1pfab3i7";
-  sgr-iosevka-term-ss04 = "1h54glwrzblg61y4f1sxm78mci47wjry4h4gdrbpx96snf31ynbb";
-  sgr-iosevka-term-ss05 = "1xzzj36817nsw15s3a1f740d89gc4634dnczjjj6vrddli8ilann";
-  sgr-iosevka-term-ss06 = "0c07i831bmfz6y7jqaip6il4cvqzc51d0w17s2dnjrnj4x3ndgmx";
-  sgr-iosevka-term-ss07 = "0x9wzf0w4pzjmzzbmzj56nkhhz5834chvxqn9519fbq1md4pfl3b";
-  sgr-iosevka-term-ss08 = "1gf1l17d8hrf1aq4pq9ai05kan8m86z8s2d7masjkvg1zaw2lb4s";
-  sgr-iosevka-term-ss09 = "1nnhciib413ll2h7ps3vyghiayz9iwniwr7byyn9pdimm0j5vq07";
-  sgr-iosevka-term-ss10 = "0qvficwhpya5sy5myxsjjfmrn9z2d9lpzyi88l8dhz3dfvyr1yzs";
-  sgr-iosevka-term-ss11 = "0ml6swvyddhz2nvq14skfh1d9d98c3d6ir0qgf97pc0qxyqbcfp2";
-  sgr-iosevka-term-ss12 = "01nxs1m2iif6lswx22h58i45zxab0nbqpf0rzlp6v3wnb8ylpbi5";
-  sgr-iosevka-term-ss13 = "0zadj9fakpqmibnxz883hwbcgqfssjvsi6kcvzik5cnamlk2jz8c";
-  sgr-iosevka-term-ss14 = "1dwfm8lcbgf8rfw11i2alrv98f9332cqyk9zvzfrjrdp9camr7j0";
-  sgr-iosevka-term-ss15 = "0z7ad7vy2faq33kpbl1x2w6i3s4af8v8fzj05rdyadws35ra3idd";
-  sgr-iosevka-term-ss16 = "1fzzkmk7ppcbmg7s50nknc7nwavfpqsja12af8qidzba9z535w2g";
-  sgr-iosevka-term-ss17 = "1rcpfgf5blg3nbf6prw9h2ylc2ji8vl6cxqlck482kncz8ph9swk";
-  sgr-iosevka-term-ss18 = "1nksii5xyi97lsrf1hxl06m0pdlk8rnsbg1s81amkzz8fxlyhzlc";
+  iosevka = "0h763gicj32dcwwcq976w81qyw5602vgybmicz0z6ryggm3r03bm";
+  iosevka-aile = "13ihigp432jvlwgh3bb4nfv6yfav2dc0rc70l17dcirp746mw7ak";
+  iosevka-curly = "1wx46yls9h179mlxcdhjbxl3s9w0pgrkr48mp97yg8dhpnpfckiv";
+  iosevka-curly-slab = "0knqx70b1hhrvmwq72b199ql3gcby3cal7qhwvzfd9p238pla2lv";
+  iosevka-etoile = "0lmx2wq0kvh0agfznqlmh2wj4hyc2cysbf4f60jiys78i81q5r8b";
+  iosevka-slab = "08x6q0al6w73kbjwpkp8zbd7sgsbwdy8pg2i2n27iid4p10hhrd9";
+  iosevka-ss01 = "1vqznn97s981mfx943m7bdvnh3h7v5syp8xq39jjb884c67ar5rg";
+  iosevka-ss02 = "0vp85rwxgv2z2v2zxgr7fbqjxmp1zyg2bp1mdxxli6pamfrjb4yq";
+  iosevka-ss03 = "131m574ngna9zyiqjgvpr64d6n7lbxnf045vs9i01agiqh7acp7p";
+  iosevka-ss04 = "04i48dgzzpjgwca691ccd914mrw2xnhak2pwgaanac5ag90w9zv0";
+  iosevka-ss05 = "1db7yn0x4vyvd2v06rmll48a842zwwigwf9jhs3m0lskiya5glaz";
+  iosevka-ss06 = "1ymad9kpl0prbj220rnw5gchicb4hi731cgjn3lgjmw737kpg183";
+  iosevka-ss07 = "1ljxbdswglw60z54px6fvk185l2h0zabgn96lgncb5wqhnn4zmd5";
+  iosevka-ss08 = "10wj07g4yss3d1d81qrm1hy8dkjn5bqym61w4innqpljficqc8da";
+  iosevka-ss09 = "0wf57sdyppba1ja5rbjn71fxlf2jh4d6m572jqqnz3fim729cll0";
+  iosevka-ss10 = "1apffjqcfs1vaj6gg3svcjfc7n1b370h0bgra489bm1xv23lsxsv";
+  iosevka-ss11 = "1zyiias5v4m7i9b2za2apkh8k7lynvyhqaxv5zha599w0di7q1zl";
+  iosevka-ss12 = "1mh8gl078f9clkimpizycj2m2bi8jx2ckidrq2p2xdwhji068wjv";
+  iosevka-ss13 = "0dhqiwdg9ng78nsr397v4ri3h682wn8yzjpw9ax5yfx7h9r85afm";
+  iosevka-ss14 = "03xslqdwm5jn3ld89nvy2lxvxh35wlwijzg0q0pvl16d4a6n6pnh";
+  iosevka-ss15 = "03v5miyz49838s5862jj2ssn7sixni91pb88ddzw47dhlwxyf8fy";
+  iosevka-ss16 = "1hs5rv8kf7sscmdvmdxszy9y1zk4bd355789gfcgznxmsd4240ig";
+  iosevka-ss17 = "0mv7ilvppwbc018fv2a6ghj0v1jd22n8z3al0hbhkn9gr9xixdj2";
+  iosevka-ss18 = "0kyl0qqpn7l87cv40vgplqw1i0qncgxq0k8yxzgaz74ski48rf4y";
+  sgr-iosevka = "0r19pllpdw3wah81ic0vzqbbrfl45cq401zx175arsxi38hz3lqa";
+  sgr-iosevka-aile = "1w2gqj5s3v11n9pzifjjy0z7bdw3qx7pwyajajamqw75zb3jh0rf";
+  sgr-iosevka-curly = "1v1q4chckiwzddcnpprsyxvii2kiim69iiim9xqx2wf3qp7sficp";
+  sgr-iosevka-curly-slab = "1dbw51i7vqga65l2i9x1vvc098nqdqi396anwzbxpz0q32lv5s0p";
+  sgr-iosevka-etoile = "1xx1q1j16fzi8z7xddbm38pm9xj71g4jyjkijqwzzfx7xphr5sk6";
+  sgr-iosevka-fixed = "1vbsg6563q4xrr0mqf94ykaz6vdi3ns4c0qaryv8m60pqidvb11h";
+  sgr-iosevka-fixed-curly = "14c4k9kbxqrrrmivfjxcmmaicmwflqph2z106s6zr6ifc8qxhk48";
+  sgr-iosevka-fixed-curly-slab = "0krlp00b4pwwnfsigjfpi5ixvsllvr6kqj8r7hwlrq6xcqkb5wxd";
+  sgr-iosevka-fixed-slab = "0zw26ldz2g1lwzman85wggb4igq8sllsi514cbi42firr16sa91q";
+  sgr-iosevka-fixed-ss01 = "09igz4ax75gbqhvckr3l6j8lna81pqnql0bii3v0f41fjqk19w2z";
+  sgr-iosevka-fixed-ss02 = "06p278qk1dq3kdq0nqbwspnxvrnhvxqssx8sa2cpcs2rp120a247";
+  sgr-iosevka-fixed-ss03 = "1ipvi2sj5prbd11f7ihcgss5yd00aqgymzxqa6njh1j3c4hwacnr";
+  sgr-iosevka-fixed-ss04 = "1pwx5r9avv97pcgsdpx5lw7lf19vg5kncn6viwrg659q0bar9bih";
+  sgr-iosevka-fixed-ss05 = "0qmak7zdqmycbf3bndbhmkifcxy818w5vsp0pl2qnkklvq2y0v4r";
+  sgr-iosevka-fixed-ss06 = "1b163h34h0yxh1jmpimjhjvj97dk2wvzcl7vnbiqwxvandlk6xrn";
+  sgr-iosevka-fixed-ss07 = "0i4rc8424vjlqp38cj8h0c168419i0b5dxklsapbwahryzh1d1gp";
+  sgr-iosevka-fixed-ss08 = "03kgjhin6cahbxgclckq8w05ax0nz4y392hwsxmvcz21p0cyglan";
+  sgr-iosevka-fixed-ss09 = "1xbr1y8izvl36s7k0wbh1a9h5dlgn3dlpyjz3mic4a60xbf7l97d";
+  sgr-iosevka-fixed-ss10 = "1kpi03gf30sfryvmi5syig7x0bcz0k2hpms0afrhaz0gprnnv2ap";
+  sgr-iosevka-fixed-ss11 = "1v3yybp1aslp811ssjiglxknnnk7p1hymaa1lxdc5hn2hawxmzzn";
+  sgr-iosevka-fixed-ss12 = "12yqrv9lvzwzps3zvhhyzdkf01j8h1abhgwnq1abma5h8mlydwkl";
+  sgr-iosevka-fixed-ss13 = "08v2zjil62i01r3nqnvpbq51jsx3fxrcqzd1s625hbcywy4x6dvb";
+  sgr-iosevka-fixed-ss14 = "1j97971kczdlkvwhcxj55yhqq5q4n1pk5k04pqffh2pl8zdzlj4h";
+  sgr-iosevka-fixed-ss15 = "10l56ypqjnnxw33vgd8ajlwiyrvcglx0yh8faxj18if77pfsk82l";
+  sgr-iosevka-fixed-ss16 = "0zfjld1s45ipwrxm1sv7kw2vs3f9lbs52zsgm31k8im6zr88rp0i";
+  sgr-iosevka-fixed-ss17 = "0b0849jmbq8ync56bn6x7gld6sciyb72ffw95xjlsnfbx2gqyp8h";
+  sgr-iosevka-fixed-ss18 = "0yyzc95b65427knjwas5yf4qsd831xz1fbwnvd0c6ngj9dc5xns0";
+  sgr-iosevka-slab = "156n7pc9va263c4rg73cv8bizimkv6sabpk7784r423vahwv1s3v";
+  sgr-iosevka-ss01 = "0bj0l93hgia8js7ikalm4ij3aa9yii1psnbymi9m5k3qxx8z4i2a";
+  sgr-iosevka-ss02 = "0nrvx3grbf0j72gm749j3bpv92qd0g2riywflwa2nxdi9zgprwvh";
+  sgr-iosevka-ss03 = "0a9k02r1fwb72dkvihm94s5fhgblz3lkjfwsywr81i5if3v7xnap";
+  sgr-iosevka-ss04 = "04yd8zwibjqwc6ml52wwbg52aya2cxm2qk6czjb0rryvb7rx7bjy";
+  sgr-iosevka-ss05 = "1syv7vigqzr42535fav2m945z4011xsnhm4sayxqkr4nx1vfx16i";
+  sgr-iosevka-ss06 = "1qj2jf9550m37ssp4djmgqd5gk76kz15vxjaiyf2wmvwbl41iwl9";
+  sgr-iosevka-ss07 = "1cx2lgqjy29wgb4a77j0ipy0ya3v8b6ipsdrdiqzpbl4j4bn0hbr";
+  sgr-iosevka-ss08 = "005vzpcqwbgj4m8c8rd7qvjgjnzwh7napxxp9np5abwv4w6alnav";
+  sgr-iosevka-ss09 = "0akhfl78fm8hxdhl4rd6d7bk7gin3hnk2y5cigxki403k415rwqc";
+  sgr-iosevka-ss10 = "1aqw31vm4l5840nzg9dghkh33l8grsi7632qh9pm6rcj1x2vsqg4";
+  sgr-iosevka-ss11 = "0gvc5rhb4291zy2zdp04ksqs65il3bwgdb4jkc8xq4v62h34i7cw";
+  sgr-iosevka-ss12 = "0kra3lgzfbf2cf5p48djay22mwzgz604x9hxkmzq0h4r5rf41lfw";
+  sgr-iosevka-ss13 = "1az0ficcg8i1fy37s8svrqi8fcqjz0rzqcprs5rz8m4qrhym0m9b";
+  sgr-iosevka-ss14 = "1xg9is9l0dhzqaxq9dpkvdi4rsfkw5nr5jzccjvpvmw3d16kzjm2";
+  sgr-iosevka-ss15 = "08r22a314aaqvsjca80k87kyi5nxwn0r63yvar6wn03sgay9hvlz";
+  sgr-iosevka-ss16 = "1nqsf9y91llvsc5z1xhwlcnw499fl4n4zvmmsrp3l1gdcg7jcvyl";
+  sgr-iosevka-ss17 = "1k5n0i2pffm403ra071ydyzvp5kiqj6q96yfwasqj2p39gjccp3j";
+  sgr-iosevka-ss18 = "0kqdggh51x3djmmag485a0mygxckly3vxnzfi659fxfb8p6n0r1n";
+  sgr-iosevka-term = "1k836142pkpwn3wnjxv329rbcycm66p24a7a0grnim9i8nsdq64g";
+  sgr-iosevka-term-curly = "1sjz4xdvdxxd1d82mgrpafi081d13pvg2csl1g8hgv38x6n2s7j2";
+  sgr-iosevka-term-curly-slab = "1vb7ccphwwl1rcb4xarigyj7jqfaglrxxa5p39vc0y3qa7rmjml6";
+  sgr-iosevka-term-slab = "14l465qi0ap8qjyzydwda7zzw4xp5gvj6234hqr7p5g7wp8fv1nn";
+  sgr-iosevka-term-ss01 = "0b0m1aa7mq0n8yv3m6bchjh50ixl32z1247vkfa7gi53qhprr4zn";
+  sgr-iosevka-term-ss02 = "08cdlhgi6sidm62yw6v2n89bmwrgqx1rdwwx72lxhm1qmgzha7yz";
+  sgr-iosevka-term-ss03 = "076vpwn8yzgx8r49fpcmbz2djqpr4wa4m6mfcfr5n733pczfnfj4";
+  sgr-iosevka-term-ss04 = "13hyzzwhcsk7hsx8yn84zh2z1d6kzx7p7c820cfbgz2h6d6sag8j";
+  sgr-iosevka-term-ss05 = "1j3wbf35h1f7qiypbw55fpq38qmp9z4wkvbzs4rhavhjihiw9jfs";
+  sgr-iosevka-term-ss06 = "1cdphl4m1khjsi4a740jn7qcl2f7qqsbsngvpyvym1h6jxq8nm34";
+  sgr-iosevka-term-ss07 = "1in8zdy791c9ghifgy0wrvsmkw6368h5kzgnqriy6rrabrrib8sq";
+  sgr-iosevka-term-ss08 = "1ddxyz4s5rq5l9d1f1cazgcbgzbjzga1szm50l21vl5q11k8080i";
+  sgr-iosevka-term-ss09 = "03rb552pqrzkki1xiqy4c06cbj7igdgi0sh8x6myycfikn8xjy32";
+  sgr-iosevka-term-ss10 = "1cs03craw089c19wk1ia82i1461fyhxlrknk0bajqd5g1snl60by";
+  sgr-iosevka-term-ss11 = "1l81kf1aq7i2lxas98i4xwzy71kjpx84l7gciwc18h41f3x2cs59";
+  sgr-iosevka-term-ss12 = "1svp9v04m4v1njg89qjwxvarlvnxpfibxq40izig2gzimq534iyj";
+  sgr-iosevka-term-ss13 = "0s9l2h3q6hazi9wrgf9xl9l9g38bb60k99dy219vzyfkl3y7vin4";
+  sgr-iosevka-term-ss14 = "1ffmyh2sfnwrfn66x1wd8r00fnmm6v7mvzs3shigz971adgk61si";
+  sgr-iosevka-term-ss15 = "12xygrna1g7jaz9hzkl0bnzxaky3gjmvbgy67fi65qk0fwhjb2yf";
+  sgr-iosevka-term-ss16 = "13bnl8kg2dj7yr96ngm1y8hm5w56s4mgqpq1gi11667p95wil2sy";
+  sgr-iosevka-term-ss17 = "07nh459pmfdcx6pcpzixr8d472zjqkp7122dxp6ifh0kmxnzys15";
+  sgr-iosevka-term-ss18 = "0f4fg4sbvh35sf41z5lhg0af4rkm03vrgnkral5kdvvpabxznwwq";
 }
--- a/pkgs/data/icons/catppuccin-papirus-folders/default.nix
+++ b/pkgs/data/icons/catppuccin-papirus-folders/default.nix
@ -0,0 +1,54 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  gtk3,
+  papirus-icon-theme,
+  flavor ? "mocha",
+  accent ? "blue"
+}: let
+  validAccents = ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"];
+  validFlavors = ["latte" "frappe" "macchiato" "mocha"];
+  pname = "catppuccin-papirus-folders";
+in
+  lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ]
+  lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
+
+  stdenvNoCC.mkDerivation {
+    inherit pname;
+    version = "unstable-2022-12-04";
+
+    src = fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "papirus-folders";
+      rev = "1a367642df9cf340770bd7097fbe85b9cea65bcb";
+      sha256 = "sha256-mFDfRVDA9WyriyFVzsI7iqmPopN56z54FvLkZDS2Dv8=";
+    };
+
+    nativeBuildInputs = [ gtk3 ];
+
+    postPatch = ''
+      patchShebangs ./papirus-folders
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/icons
+      cp -r --no-preserve=mode ${papirus-icon-theme}/share/icons/Papirus* $out/share/icons
+      cp -r src/* $out/share/icons/Papirus
+      for theme in $out/share/icons/*; do
+          USER_HOME=$HOME DISABLE_UPDATE_ICON_CACHE=1 \
+            ./papirus-folders -t $theme -o -C cat-${flavor}-${accent}
+          gtk-update-icon-cache --force $theme
+      done
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      description = "Soothing pastel theme for Papirus Icon Theme folders";
+      homepage = "https://github.com/catppuccin/papirus-folders";
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ rubyowo ];
+    };
+  }
--- a/pkgs/data/themes/base16-schemes/default.nix
+++ b/pkgs/data/themes/base16-schemes/default.nix
@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "base16-schemes";
+  version = "unstable-2022-12-16";
+
+  src = fetchFromGitHub {
+    owner = "tinted-theming";
+    repo = "base16-schemes";
+    rev = "cf6bc892a24af19e11383adedc6ce7901f133ea7";
+    sha256 = "sha256-U9pfie3qABp5sTr3M9ga/jX8C807FeiXlmEZnC4ZM58=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes/
+    install *.yaml $out/share/themes/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "All the color schemes for use in base16 packages";
+    homepage = finalAttrs.src.meta.homepage;
+    maintainers = [ maintainers.DamienCassou ];
+    license = licenses.mit;
+  };
+})
--- a/pkgs/development/compilers/cudatoolkit/flags.nix
+++ b/pkgs/development/compilers/cudatoolkit/flags.nix
@ -2,7 +2,18 @@
 , lib
 , cudatoolkit
 }:
+
+# Type aliases
+# Gpu = {
+#   archName: String, # e.g., "Hopper"
+#   computeCapability: String, # e.g., "9.0"
+#   minCudaVersion: String, # e.g., "11.8"
+#   maxCudaVersion: String, # e.g., "12.0"
+# }
+
 let
+  inherit (lib) attrsets lists strings trivial versions;
+  cudaVersion = cudatoolkit.version;

  # Flags are determined based on your CUDA toolkit by default.  You may benefit
  # from improved performance, reduced file size, or greater hardware suppport by
@ -13,66 +24,116 @@ let
  #
  # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351

-  defaultCudaCapabilities = rec {
-    cuda9 = [
-      "3.0"
-      "3.5"
-      "5.0"
-      "5.2"
-      "6.0"
-      "6.1"
-      "7.0"
-    ];
+  # gpus :: List Gpu
+  gpus = builtins.import ./gpus.nix;

-    cuda10 = cuda9 ++ [
-      "7.5"
-    ];
+  # isVersionIn :: Gpu -> Bool
+  isSupported = gpu:
+    let
+      inherit (gpu) minCudaVersion maxCudaVersion;
+      lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion;
+      upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion);
+    in
+    lowerBoundSatisfied && upperBoundSatisfied;

-    cuda11 = [
-      "3.5"
-      "5.0"
-      "5.2"
-      "6.0"
-      "6.1"
-      "7.0"
-      "7.5"
-      "8.0"
-      "8.6"
-    ];
+  # supportedGpus :: List Gpu
+  # GPUs which are supported by the provided CUDA version.
+  supportedGpus = builtins.filter isSupported gpus;

-  };
+  # cudaArchNameToVersions :: AttrSet String (List String)
+  # Maps the name of a GPU architecture to different versions of that architecture.
+  # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ].
+  cudaArchNameToVersions =
+    lists.groupBy'
+      (versions: gpu: versions ++ [ gpu.computeCapability ])
+      [ ]
+      (gpu: gpu.archName)
+      supportedGpus;

-  cudaMicroarchitectureNames = {
-    "3" = "Kepler";
-    "5" = "Maxwell";
-    "6" = "Pascal";
-    "7" = "Volta";
-    "8" = "Ampere";
-    "9" = "Hopper";
-  };
+  # cudaArchNames :: List String
+  # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here;
+  #   otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them
+  #   from is already sorted, so we'll preserve that order here.
+  cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus);

-  defaultCudaArchList = defaultCudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
-  cudaRealCapabilities = config.cudaCapabilities or defaultCudaArchList;
-  capabilitiesForward = "${lib.last cudaRealCapabilities}+PTX";
+  # cudaComputeCapabilityToName :: AttrSet String String
+  # Maps the version of a GPU architecture to the name of that architecture.
+  # For example, "8.0" maps to "Ampere".
+  cudaComputeCapabilityToName = builtins.listToAttrs (
+    lists.map
+      (gpu: {
+        name = gpu.computeCapability;
+        value = gpu.archName;
+      })
+      supportedGpus
+  );

-  dropDot = ver: builtins.replaceStrings ["."] [""] ver;
+  # cudaComputeCapabilities :: List String
+  # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here;
+  #   otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them
+  #   from is already sorted, so we'll preserve that order here.
+  # Use the user-provided list of CUDA capabilities if it's provided.
+  cudaComputeCapabilities = config.cudaCapabilities
+    or (lists.map (gpu: gpu.computeCapability) supportedGpus);

-  archMapper = feat: map (ver: "${feat}_${dropDot ver}");
-  gencodeMapper = feat: map (ver: "-gencode=arch=compute_${dropDot ver},code=${feat}_${dropDot ver}");
-  cudaRealArchs = archMapper "sm" cudaRealCapabilities;
-  cudaPTXArchs = archMapper "compute" cudaRealCapabilities;
-  cudaArchs = cudaRealArchs ++ [ (lib.last cudaPTXArchs) ];
+  # cudaForwardComputeCapability :: String
+  cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX";

-  cudaArchNames = lib.unique (map (v: cudaMicroarchitectureNames.${lib.versions.major v}) cudaRealCapabilities);
-  cudaCapabilities = cudaRealCapabilities ++ lib.optional (config.cudaForwardCompat or true) capabilitiesForward;
-  cudaGencode = gencodeMapper "sm" cudaRealCapabilities ++ lib.optionals (config.cudaForwardCompat or true) (gencodeMapper "compute" [ (lib.last cudaPTXArchs) ]);
+  # cudaComputeCapabilitiesAndForward :: List String
+  # The list of supported CUDA architectures, including the forward compatibility architecture.
+  # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities.
+  cudaComputeCapabilitiesAndForward = cudaComputeCapabilities
+    ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability;

-  cudaCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaCapabilities;
-  cudaCapabilitiesSemiColonString = lib.strings.concatStringsSep ";" cudaCapabilities;
-  cudaRealCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaRealCapabilities;
+  # dropDot :: String -> String
+  dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver;
+
+  # archMapper :: String -> List String -> List String
+  # Maps a feature across a list of architecture versions to produce a list of architectures.
+  # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ].
+  archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}");
+
+  # gencodeMapper :: String -> List String -> List String
+  # Maps a feature across a list of architecture versions to produce a list of gencode arguments.
+  # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80"
+  # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ].
+  gencodeMapper = feat: lists.map (
+    computeCapability:
+    "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}"
+  );
+
+  # cudaRealArches :: List String
+  # The real architectures are physical architectures supported by the CUDA version.
+  # For example, "sm_80".
+  cudaRealArches = archMapper "sm" cudaComputeCapabilities;
+
+  # cudaVirtualArches :: List String
+  # The virtual architectures are typically used for forward compatibility, when trying to support
+  # an architecture newer than the CUDA version allows.
+  # For example, "compute_80".
+  cudaVirtualArches = archMapper "compute" cudaComputeCapabilities;
+
+  # cudaArches :: List String
+  # By default, build for all supported architectures and forward compatibility via a virtual
+  # architecture for the newest supported architecture.
+  cudaArches = cudaRealArches ++
+    lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches);
+
+  # cudaGencode :: List String
+  # A list of CUDA gencode arguments to pass to NVCC.
+  cudaGencode =
+    let
+      base = gencodeMapper "sm" cudaComputeCapabilities;
+      forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ];
+    in
+    base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat;

 in
 {
-   inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString
-     cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs;
+  inherit
+    cudaArchNames
+    cudaArchNameToVersions cudaComputeCapabilityToName
+    cudaRealArches cudaVirtualArches cudaArches
+    cudaGencode;
+  cudaCapabilities = cudaComputeCapabilitiesAndForward;
 }
--- a/pkgs/development/compilers/cudatoolkit/gpus.nix
+++ b/pkgs/development/compilers/cudatoolkit/gpus.nix
@ -0,0 +1,110 @@
+[
+  {
+    archName = "Kepler";
+    computeCapability = "3.0";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "10.2";
+  }
+  {
+    archName = "Kepler";
+    computeCapability = "3.2";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "10.2";
+  }
+  {
+    archName = "Kepler";
+    computeCapability = "3.5";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "11.8";
+  }
+  {
+    archName = "Kepler";
+    computeCapability = "3.7";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "11.8";
+  }
+  {
+    archName = "Maxwell";
+    computeCapability = "5.0";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Maxwell";
+    computeCapability = "5.2";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Maxwell";
+    computeCapability = "5.3";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Pascal";
+    computeCapability = "6.0";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Pascal";
+    computeCapability = "6.1";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Pascal";
+    computeCapability = "6.2";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Volta";
+    computeCapability = "7.0";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Volta";
+    computeCapability = "7.2";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Turing";
+    computeCapability = "7.5";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Ampere";
+    computeCapability = "8.0";
+    minCudaVersion = "11.2";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Ampere";
+    computeCapability = "8.6";
+    minCudaVersion = "11.2";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Ampere";
+    computeCapability = "8.7";
+    minCudaVersion = "11.5";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Ada";
+    computeCapability = "8.9";
+    minCudaVersion = "11.8";
+    maxCudaVersion = "12.0";
+  }
+  {
+    archName = "Hopper";
+    computeCapability = "9.0";
+    minCudaVersion = "11.8";
+    maxCudaVersion = "12.0";
+  }
+]
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@ -48,7 +48,7 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-llvm-${targetName}";
-  version = "5.4.2";
+  version = "5.4.3";

  outputs = [
    "out"
@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: {
    owner = "RadeonOpenCompute";
    repo = "llvm-project";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-iyr3cstC8CB1YaACadNqBs/oI8lh4bJzK0WtEB0wZvg=";
+    hash = "sha256-BDvC6QFDFtahA9hmJDLiM6K4mrO3j9E9rEXm7KulcuA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
          nixfmt
        ]
      }
-      versionSelect='v${versions.major version}.${versions.minor version}.*'
+      versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*'
      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
      latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
      if [ "$oldVersion" != "$latestTag" ]; then
--- a/pkgs/development/interpreters/kerf/default.nix
+++ b/pkgs/development/interpreters/kerf/default.nix
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
  makeFlags = [ "kerf" "kerf_test" ];

  # avoid a huge amount of warnings to make failures clearer
-  env.NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [
+  env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [
    "void-pointer-to-int-cast"
    "format"
    "implicit-function-declaration"
    "gnu-variable-sized-type-not-at-end"
    "unused-result"
-  ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ];
+  ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]);

  patchPhase = ''
    substituteInPlace ./Makefile \
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "zef";
-  version = "0.16.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "ugexe";
    repo = "zef";
    rev = "v${version}";
-    sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo=";
+    sha256 = "sha256-ekryYPSuBhK+0BvzGxtQVkWDIsfpqbWLc/WXjhPcFYw=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/libraries/fizz/default.nix
+++ b/pkgs/development/libraries/fizz/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "fizz";
-  version = "2023.02.06.00";
+  version = "2023.02.20.00";

  src = fetchFromGitHub {
    owner = "facebookincubator";
    repo = "fizz";
    rev = "v${version}";
-    sha256 = "sha256-JwRoIiSumT1jw5/VX/TkxpTJbrmLLke27xH8UHtrs2c=";
+    hash = "sha256-qgp0E/xCbvMIndwUkqsvZuFY7333NviOkljqiMOhKtw=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@ -32,13 +32,13 @@ let
  ];
 in stdenv.mkDerivation rec {
  pname = "gjs";
-  version = "1.74.1";
+  version = "1.74.2";

  outputs = [ "out" "dev" "installedTests" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-8h+c0zN6ZypEx+ZL+ajYrXfBuIuVKythhMevmx8+9Fk=";
+    sha256 = "sha256-pAb9ahZSz2bcqyKAYr0Wp19bM3gkjfu74BayEnRKMLY=";
  };

  patches = [
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "glbinding";
-  version = "3.1.0";
+  version = "3.3.0";

  src = fetchFromGitHub {
    owner = "cginternals";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08";
+    sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/gvm-libs/default.nix
+++ b/pkgs/development/libraries/gvm-libs/default.nix
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
  ];

  cmakeFlags = [
-    "-DGVM_RUN_DIR=$out/run/gvm"
+    "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm"
  ];

  meta = with lib; {
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "lombok";
-  version = "1.18.24";
+  version = "1.18.26";

  src = fetchurl {
    url = "https://projectlombok.org/downloads/lombok-${version}.jar";
-    sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k=";
+    sha256 = "sha256-KvH6g2hIdhtuUUQOxii0ncOAgOmHG7NScB+4yDWAh88=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@ -9,13 +9,13 @@
  nv-codec-headers = nv-codec-headers-11;
 }).overrideAttrs (old: rec {
  pname = "jellyfin-ffmpeg";
-  version = "5.1.2-7";
+  version = "5.1.2-8";

  src = fetchFromGitHub {
    owner = "jellyfin";
    repo = "jellyfin-ffmpeg";
    rev = "v${version}";
-    sha256 = "sha256-OWSixz1QjWthykO55wMAlywe2ihFLugzLH1qg4Qbe3I=";
+    sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc=";
  };

  buildInputs = old.buildInputs ++ [ chromaprint ];
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@ -23,10 +23,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;

-  env.NIX_CFLAGS_COMPILE =
-    lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
-      "-std=c++11"
-    ];
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11";

  dontWrapQtApps = true;

--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "libmysqlconnectorcpp";
-  version = "8.0.31";
+  version = "8.0.32";

  src = fetchurl {
    url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
-    hash = "sha256-HSF7yEybmzzDQvl1cwUZ/mlXqVXxnIHqg2a/HfJtELA=";
+    hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@ -52,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: {
    "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/gcc"
    "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/g++"
    "-DMAGMA_ENABLE_CUDA=ON"
-    "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArchs}"
+    "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArches}"
  ] ++ lib.optionals useROCM [
    "-DCMAKE_C_COMPILER=${hip}/bin/hipcc"
    "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc"
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@ -17,8 +17,6 @@
 , libdrm
 , libjpeg_turbo
 , libopus
-, withLibsoup2 ? false
-, libsoup
 , libsoup_3
 , libusb1
 , lz4
@ -27,7 +25,6 @@
 , ninja
 , openssl
 , perl
-, phodav_2_0
 , phodav
 , pixman
 , pkg-config
@ -120,11 +117,11 @@ stdenv.mkDerivation rec {
    libcacard
    libjpeg_turbo
    libopus
-    (if withLibsoup2 then libsoup else libsoup_3)
+    libsoup_3
    libusb1
    lz4
    openssl
-    (if withLibsoup2 then phodav_2_0 else phodav)
+    phodav
    pixman
    spice-protocol
    usbredir
--- a/pkgs/development/libraries/yder/default.nix
+++ b/pkgs/development/libraries/yder/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "yder";
-  version = "1.4.17";
+  version = "1.4.19";

  src = fetchFromGitHub {
    owner = "babelouest";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc=";
+    sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo=";
  };

  patches = [
--- a/pkgs/development/ocaml-modules/functoria/default.nix
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@ -4,13 +4,14 @@

 buildDunePackage rec {
  pname   = "functoria";
-  version = "4.2.0";
+  version = "4.3.4";

+  duneVersion = "3";
  minimalOCamlVersion = "4.08";

  src = fetchurl {
    url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
-    sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8=";
+    hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY=";
  };

  propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@ -12,7 +12,7 @@ let param =
      rev = version;
      sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
    };
-    env.NIX_CFLAGS_COMPILE = null;
+    env = { };
    buildInputs = [ camlp-streams ];
  } else if check "3.12" then {
    version = "2.18.5";
--- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix
@ -10,13 +10,13 @@ buildDunePackage rec {
  pname = "mirage-bootvar-xen";
  version = "0.8.0";

-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";

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

  src = fetchurl {
    url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz";
-    sha256 = "0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv";
+    hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/mirage-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix
@ -17,14 +17,15 @@

 buildDunePackage rec {
  pname = "mirage-xen";
-  version = "7.2.0";
+  version = "8.0.1";

  src = fetchurl {
    url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
-    sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA=";
+    hash = "sha256-x8i2Kbz0EcifZK/lbDIFa9Kwtl1/xzbYV9h9E+EtGP4=";
  };

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  propagatedBuildInputs = [
    cstruct
--- a/pkgs/development/ocaml-modules/mirage/default.nix
+++ b/pkgs/development/ocaml-modules/mirage/default.nix
@ -8,6 +8,7 @@ buildDunePackage rec {
  inherit (mirage-runtime) version src;

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  outputs = [ "out" "dev" ];

--- a/pkgs/development/ocaml-modules/paf/default.nix
+++ b/pkgs/development/ocaml-modules/paf/default.nix
@ -25,11 +25,11 @@

 buildDunePackage rec {
  pname = "paf";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchurl {
    url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
-    sha256 = "sha256-+RkrmWJJREHg8BBdNe92vYhd2/Frvs7l5qOr9jBwymU=";
+    hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE=";
  };

  minimalOCamlVersion = "4.08";
--- a/pkgs/development/ocaml-modules/paf/le.nix
+++ b/pkgs/development/ocaml-modules/paf/le.nix
@ -1,6 +1,7 @@
 { lib
 , buildDunePackage
 , paf
+, dns-client
 , duration
 , emile
 , httpaf
@ -23,6 +24,7 @@ buildDunePackage {

  propagatedBuildInputs = [
    paf
+    dns-client
    duration
    emile
    httpaf
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "13.4.0";
+  version = "13.4.1";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "esphome";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-auqG+2Y+Dgwtkwbidi430n4t+GnZlBHIPUmsfl1aPa0=";
+    hash = "sha256-J0nhHJQkmcAPpkNRfyFyhJun54J3g18js47dSS3pvas=";
  };

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

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "2.6.1";
+  version = "2.6.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-g/8vzd7ehPNVNzvymXU/i8NiYv7UR9uWfUPnVDQsFg0=";
+    hash = "sha256-FqZYJoNaRISuZ5m5ZeeregPdBT4fh8NdcgzEho0ZWd0=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/ansible-later/default.nix
+++ b/pkgs/development/python-modules/ansible-later/default.nix
@ -24,7 +24,7 @@

 buildPythonPackage rec {
  pname = "ansible-later";
-  version = "3.1.0";
+  version = "3.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -33,7 +33,7 @@ buildPythonPackage rec {
    owner = "thegeeklab";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI=";
+    hash = "sha256-5TV9cTMTx8R6jf9HypieinCyNgHC4LSHTRQd9RXApG4=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@ -48,13 +48,13 @@

 buildPythonPackage rec {
  pname = "apache-beam";
-  version = "2.44.0";
+  version = "2.45.0";

  src = fetchFromGitHub {
    owner = "apache";
    repo = "beam";
    rev = "refs/tags/v${version}";
-    hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU=";
+    hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0=";
  };

  patches = [
@ -76,11 +76,15 @@ buildPythonPackage rec {
    # See https://github.com/NixOS/nixpkgs/issues/193613
    "protobuf"

-    # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but
+    # As of apache-beam v2.45.0, the requirement is httplib2>=0.8,<0.21.0, but
    # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be
    # removed once beam is upgraded since the current requirement on master is
    # for httplib2>=0.8,<0.22.0.
    "httplib2"
+
+    # As of apache-beam v2.45.0, the requirement is pyarrow<10.0.0,>=0.15.1, but
+    # the current (2023-02-22) nixpkgs's pyarrow version is 11.0.0.
+    "pyarrow"
  ];

  sourceRoot = "source/sdks/python";
--- a/pkgs/development/python-modules/arpy/default.nix
+++ b/pkgs/development/python-modules/arpy/default.nix
@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "arpy";
+  version = "2.3.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "viraptor";
+    repo = pname;
+    rev = version;
+    hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s=";
+  };
+
+  checkInputs = [
+    unittestCheckHook
+  ];
+
+  pythonImportsCheck = [ "arpy" ];
+
+  meta = with lib; {
+    description = "A library for accessing the archive files and reading the contents";
+    homepage = "https://github.com/viraptor/arpy";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ thornycrackers ];
+  };
+}
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@ -20,14 +20,14 @@

 buildPythonPackage rec {
  pname = "asyncssh";
-  version = "2.13.0";
+  version = "2.13.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-vn4ctHIl3JiZ5WRy/cTarANYSmhDZ1MpwM5nF5yyDik=";
+    hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic=";
  };

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

 buildPythonPackage rec {
  pname = "azure-mgmt-cognitiveservices";
-  version = "13.3.0";
+  version = "13.4.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI=";
+    hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA=";
  };

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

 buildPythonPackage rec {
  pname = "azure-mgmt-datafactory";
-  version = "2.10.0";
+  version = "3.0.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s=";
+    hash = "sha256-aVfH65fJnsTSr0MR0Fr5yamxIOv2+aST953uCr7QXOk=";
  };

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

 buildPythonPackage rec {
  pname = "azure-mgmt-recoveryservices";
-  version = "2.2.0";
+  version = "2.3.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss=";
+    hash = "sha256-4L6Tqgvqh+nJyeXMolSpQ/2knAED75RQqD/lUDOt5ek=";
  };

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

 buildPythonPackage rec {
  pname = "azure-mgmt-reservations";
-  version = "2.1.0";
+  version = "2.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-CtTOw6cC9fkL+2XgfG/r/LXpzhQoYXLjrwlI6Q5XpP4=";
+    hash = "sha256-P6GLB5+2p9sS9XSwSykQXHXw5YrJNNSgs5d7sy5jHTk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/bugsnag/default.nix
+++ b/pkgs/development/python-modules/bugsnag/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "bugsnag";
-  version = "4.3.0";
+  version = "4.4.0";
  format = "setuptools";

  disabled = pythonOlder "3.5";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-9q6Cp/reUJJ3XGMT9BV+4z5AxJdP8izfzgjOpS84/Tc=";
+    hash = "sha256-1vtoDmyulfH3YDdMoT9qBFaRd48nnTBCt0iWuQtk3iw=";
  };

  propagatedBuildInputs = [
@ -40,6 +40,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Automatic error monitoring for Python applications";
    homepage = "https://github.com/bugsnag/bugsnag-python";
+    changelog = "https://github.com/bugsnag/bugsnag-python/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ ];
  };
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "cloudpickle";
-  version = "2.2.0";
+  version = "2.2.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8=";
+    hash = "sha256-2JaEuN6eNKKkOzRg+8oH0J1uJc6FjfTVpEJAQDthePU=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/cstruct/default.nix
+++ b/pkgs/development/python-modules/cstruct/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "cstruct";
+  version = "5.2";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "andreax79";
+    repo = "python-cstruct";
+    rev = "v${version}";
+    hash = "sha256-Dwogf0mmxFyBV7tPsuKV6gMZLPSCm7YhzqgJNHpaPFA=";
+  };
+
+  pythonImportsCheck = [
+    "cstruct"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "C-style structs for Python";
+    homepage = "https://github.com/andreax79/python-cstruct";
+    changelog = "https://github.com/andreax79/python-cstruct/blob/v${version}/changelog.txt";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tnias ];
+  };
+}
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@ -25,14 +25,14 @@

 buildPythonPackage rec {
  pname = "datashader";
-  version = "0.14.3";
+  version = "0.14.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28=";
+    hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@ -1,14 +1,11 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, fontpens
-, fonttools
-, fs
-, lxml
-, pytestCheckHook
 , pythonOlder
+, fetchPypi
 , setuptools-scm
-, unicodedata2
+, fonttools
+, fontpens
+, pytestCheckHook
 }:

 buildPythonPackage rec {
@ -30,23 +27,27 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    fonttools
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.unicode;

  nativeCheckInputs = [
-    fontpens
-    fs
-    lxml
    pytestCheckHook
-    unicodedata2
  ];

  pythonImportsCheck = [
    "defcon"
  ];

+  passthru.optional-dependencies = {
+    pens = [ fontpens ];
+    lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml;
+  };
+
  meta = with lib; {
    description = "A set of UFO based objects for use in font editing applications";
    homepage = "https://github.com/robotools/defcon";
+    changelog = "https://github.com/robotools/defcon/releases/tag/${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ sternenseemann ];
  };
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "dsmr-parser";
-  version = "1.0.0";
+  version = "1.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "ndokter";
    repo = "dsmr_parser";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q=";
+    hash = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg=";
  };

  propagatedBuildInputs = [
@ -43,6 +43,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
    homepage = "https://github.com/ndokter/dsmr_parser";
+    changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "0.38.1";
+  version = "0.40.3";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-xuNxsG8wMpdwyA0BkEYepnGjIZGmUzTivN5paLtM68Q=";
+    hash = "sha256-kJABNVUFoaN8Q7IVJKW/LF2kJwB4HcsvMEDmE6eTAxg=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , funcy
@ -13,7 +14,7 @@

 buildPythonPackage rec {
  pname = "dvc-render";
-  version = "0.0.17";
+  version = "0.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -22,7 +23,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg=";
+    hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -50,6 +51,10 @@ buildPythonPackage rec {
  ++ passthru.optional-dependencies.table
  ++ passthru.optional-dependencies.markdown;

+  disabledTestPaths = lib.optionals stdenv.isDarwin [
+    "tests/test_vega.py"
+  ];
+
  pythonImportsCheck = [
    "dvc_render"
  ];
--- a/pkgs/development/python-modules/flake8-length/default.nix
+++ b/pkgs/development/python-modules/flake8-length/default.nix
@ -1,14 +1,17 @@
 { lib
 , buildPythonPackage
-, pythonOlder
-, flake8
-, pytestCheckHook
 , fetchPypi
+, flake8
+, flit-core
+, pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "flake8-length";
  version = "0.3.1";
+  format = "pyproject";
+
  disabled = pythonOlder "3.6";

  src = fetchPypi {
@ -16,22 +19,31 @@ buildPythonPackage rec {
    sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA=";
  };

+  nativeBuildInputs = [
+    flit-core
+  ];
+
  propagatedBuildInputs = [
    flake8
  ];

+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
  pythonImportsCheck = [
    "flake8_length"
  ];

-  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [
+    "tests/"
+  ];

-  pytestFlagsArray = [ "tests/" ];
-
-  meta = {
+  meta = with lib; {
    description = "Flake8 plugin for a smart line length validation";
    homepage = "https://github.com/orsinium-labs/flake8-length";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ sauyon ];
+    changelog = "https://github.com/orsinium-labs/flake8-length/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sauyon ];
  };
 }
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@ -95,6 +95,8 @@ buildPythonPackage rec {
    "flask_admin/tests/sqla/test_inlineform.py"
    "flask_admin/tests/sqla/test_postgres.py"
    "flask_admin/tests/sqla/test_translation.py"
+    # RuntimeError: Working outside of application context.
+    "flask_admin/tests/sqla/test_multi_pk.py"
  ];

  pythonImportsCheck = [
@ -104,6 +106,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Admin interface framework for Flask";
    homepage = "https://github.com/flask-admin/flask-admin/";
+    changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ costrouc ];
  };
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-asset";
-  version = "3.17.1";
+  version = "3.18.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc=";
+    hash = "sha256-BW+zYDmK9CPmzePAgQWXRQ8JrQNgEulPGtQgUdnrY4I=";
  };

  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.7.1";
+  version = "1.8.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

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

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

 buildPythonPackage rec {
  pname = "google-cloud-os-config";
-  version = "1.14.1";
+  version = "1.15.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM=";
+    hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo=";
  };

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

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2023.2.9";
+  version = "2023.2.10";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-JNsF8HKat5+yp7Q0l4IKysiJrJ0Q4fEQ+zLAT25hAb0=";
+    sha256 = "sha256-LyX/wHd4FnI9RrmwV6IDhz8gWJlBwG3Up64JYaIVdmM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "iminuit";
-  version = "2.19.0";
+  version = "2.20.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-9NHLrM8RXNxIZpaPZJ8qN3lKXA3gGN6BVqp0VWNQpUw=";
+    hash = "sha256-pz/m4C814xgPwBvFwXlO32Yv8XJcO8Kk9DNWd5nadQQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/ipympl/default.nix
+++ b/pkgs/development/python-modules/ipympl/default.nix
@ -8,12 +8,12 @@

 buildPythonPackage rec {
  pname = "ipympl";
-  version = "0.9.2";
+  version = "0.9.3";
  format = "wheel";

  src = fetchPypi {
    inherit pname version format;
-    sha256 = "sha256-ZVYE8L9tJkz1mXZpUKWybiktEHzCPhl1A2R+dUF5gcw=";
+    sha256 = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM=";
  };


--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@ -164,7 +164,7 @@ let
      build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}"
      build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}"
      build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}"
-      build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${cudaFlags.cudaRealCapabilitiesCommaString}"
+      build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}"
    '' + ''
      CFG
    '';
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@ -20,7 +20,9 @@ buildPythonPackage rec {
    hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU=";
  };

-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
+    "-I${lib.getDev libcxx}/include/c++/v1"
+  ];

  nativeBuildInputs = [
    setuptools-scm
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@ -3,6 +3,7 @@
 , pythonOlder
 , fetchPypi
 , marshmallow
+, packaging
 , sqlalchemy
 , pytest-lazy-fixture
 , pytestCheckHook
@ -10,16 +11,19 @@

 buildPythonPackage rec {
  pname = "marshmallow-sqlalchemy";
-  version = "0.28.1";
-  disabled = pythonOlder "3.6";
+  version = "0.28.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-qjdnRylngKVjVeMGe5yL9DoqHET/mF3oKzpdnhYcorg=";
+    hash = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE=";
  };

  propagatedBuildInputs = [
    marshmallow
+    packaging
    sqlalchemy
  ];

@ -33,9 +37,10 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
-    homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
    description = "SQLAlchemy integration with marshmallow";
+    homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
+    changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst";
    license = licenses.mit;
+    maintainers = with maintainers; [ ];
  };
-
 }
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@ -23,16 +23,18 @@

 buildPythonPackage rec {
  pname = "mat2";
-  version = "0.13.2";
+  version = "0.13.3";

  disabled = pythonOlder "3.5";

+  format = "setuptools";
+
  src = fetchFromGitLab {
    domain = "0xacab.org";
    owner = "jvoisin";
    repo = "mat2";
    rev = version;
-    hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk=";
+    hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8=";
  };

  patches = [
@ -56,6 +58,7 @@ buildPythonPackage rec {
  ];

  postPatch = ''
+    rm pyproject.toml
    substituteInPlace dolphin/mat2.desktop \
      --replace "@mat2@" "$out/bin/mat2" \
      --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
--- a/pkgs/development/python-modules/mat2/paths.patch
+++ b/pkgs/development/python-modules/mat2/paths.patch
@ -13,7 +13,7 @@ index 41c8de4..11df258 100644
 +Exec=@kdialog@ --yesno  "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U
 +Exec[de]=@kdialog@ --yesno  "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U
 diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
-index cdfce3d..1e83520 100644
+index 2b91ac2..5fcf6e5 100644
 --- a/libmat2/exiftool.py
 +++ b/libmat2/exiftool.py
@@ -1,8 +1,6 @@
@ -23,13 +23,13 @@ index cdfce3d..1e83520 100644
 import os
 -import shutil
 import subprocess
- from typing import Union
+ from typing import Union, Set, Dict
 
@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser):
             return False
         return True
 
-@functools.lru_cache
+-@functools.lru_cache(maxsize=None)
 def _get_exiftool_path() -> str:  # pragma: no cover
 -    which_path = shutil.which('exiftool')
 -    if which_path:
@ -42,7 +42,7 @@ index cdfce3d..1e83520 100644
 -    raise RuntimeError("Unable to find exiftool")
 +    return '@exiftool@'
 diff --git a/libmat2/video.py b/libmat2/video.py
-index 4d33aa4..6388664 100644
+index 39059c5..82fe1e7 100644
 --- a/libmat2/video.py
 +++ b/libmat2/video.py
@@ -1,6 +1,4 @@
@ -51,12 +51,12 @@ index 4d33aa4..6388664 100644
 -import shutil
 import logging
 
- from typing import Union
+ from typing import Union, Dict
@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
     }
 
 
-@functools.lru_cache()
+-@functools.lru_cache(maxsize=None)
 def _get_ffmpeg_path() -> str:  # pragma: no cover
 -    which_path = shutil.which('ffmpeg')
 -    if which_path:
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "mcstatus";
-  version = "10.0.1";
+  version = "10.0.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "py-mine";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8=";
+    hash = "sha256-8RdJarRoBOkHZfFAKnDgqu8dANQLwKAoY2g8SwbuDeE=";
  };

  nativeBuildInputs = [
@ -62,6 +62,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python library for checking the status of Minecraft servers";
    homepage = "https://github.com/py-mine/mcstatus";
+    changelog = "https://github.com/py-mine/mcstatus/releases/tag/v${version}";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/mdp/default.nix
+++ b/pkgs/development/python-modules/mdp/default.nix
@ -2,32 +2,52 @@
 , buildPythonPackage
 , fetchPypi
 , future
+, joblib
 , numpy
 , pytest
+, pythonOlder
+, scikit-learn
 }:

 buildPythonPackage rec {
-  pname = "MDP";
+  pname = "mdp";
  version = "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e";
+    pname = "MDP";
+    inherit version;
+    hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4=";
  };

-  propagatedBuildInputs = [ future numpy ];
-
-  nativeCheckInputs = [ pytest ];
-
-  doCheck = true;
-
-  pythonImportsCheck = [ "mdp" "bimdp" ];
-
  postPatch = ''
    # https://github.com/mdp-toolkit/mdp-toolkit/issues/92
-    substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict
+    substituteInPlace mdp/utils/routines.py \
+      --replace numx.typeDict numx.sctypeDict
+    substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \
+      --replace py.test"" "pytest"
+    substituteInPlace mdp/test/test_RecursiveExpansionNode.py \
+      --replace py.test"" "pytest"
  '';

+  propagatedBuildInputs = [
+    future
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    joblib
+    pytest
+    scikit-learn
+  ];
+
+  pythonImportsCheck = [
+    "mdp"
+    "bimdp"
+  ];
+
  checkPhase = ''
    runHook preCheck

@ -39,7 +59,8 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Library for building complex data processing software by combining widely used machine learning algorithms";
-    homepage = "https://mdp-toolkit.sourceforge.net";
+    homepage = "https://mdp-toolkit.github.io/";
+    changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES";
    license = licenses.bsd3;
    maintainers = with maintainers; [ nico202 ];
  };
--- a/pkgs/development/python-modules/oslo-serialization/default.nix
+++ b/pkgs/development/python-modules/oslo-serialization/default.nix
@ -11,12 +11,12 @@

 buildPythonPackage rec {
  pname = "oslo-serialization";
-  version = "5.1.0";
+  version = "5.1.1";

  src = fetchPypi {
    pname = "oslo.serialization";
    inherit version;
-    sha256 = "sha256-pIR98yaBwahL0TotunpuydW0SITeYyUhGS9tx1DOCYQ=";
+    sha256 = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@ -1,28 +1,70 @@
-{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } :
-buildPythonPackage rec {
-  pname = "OWSLib";
-  version = "0.27.2";
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyproj
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, pytz
+, pyyaml
+, requests
+, python
+}:

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s=";
+buildPythonPackage rec {
+  pname = "owslib";
+  version = "0.28.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "geopython";
+    repo = "OWSLib";
+    rev = "refs/tags/${version}";
+    hash = "sha256-o/sNhnEZ9e0BsftN9AhJKuUjKHAHNRPe0grxdAWRVao=";
  };

-  # as now upstream https://github.com/geopython/OWSLib/pull/824
  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace 'pyproj ' 'pyproj #'
+    substituteInPlace tox.ini \
+      --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" ""
  '';

-  buildInputs = [ pytest ];
-  propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ];
+  propagatedBuildInputs = [
+    pyproj
+    python-dateutil
+    pytz
+    pyyaml
+    requests
+  ];

-  # 'tests' dir not included in pypy distribution archive.
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "owslib"
+  ];
+
+  preCheck = ''
+    # _pytest.pathlib.ImportPathMismatchError: ('owslib.swe.sensor.sml', '/build/source/build/...
+    export PY_IGNORE_IMPORTMISMATCH=1
+  '';
+
+  disabledTests = [
+    # Tests require network access
+    "test_ows_interfaces_wcs"
+    "test_wfs_110_remotemd"
+    "test_wfs_200_remotemd"
+    "test_wms_130_remotemd"
+    "test_wmts_example_informatievlaanderen"
+  ];

  meta = with lib; {
-    description = "client for Open Geospatial Consortium web service interface standards";
-    license = licenses.bsd3;
+    description = "Client for Open Geospatial Consortium web service interface standards";
    homepage = "https://www.osgeo.org/projects/owslib/";
+    changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "peaqevcore";
-  version = "12.0.2";
+  version = "12.1.6";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-TfIzTbVXhS+DxroxBqfodS4HAQBPJQ4/Vo4Jh8VjYfM=";
+    hash = "sha256-6DuvA1HAMr4A9mNH9jFKH9IWOt4010iZewldCDWWmPE=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/puremagic/default.nix
+++ b/pkgs/development/python-modules/puremagic/default.nix
@ -1,23 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytestCheckHook
 , pythonOlder
 }:

 buildPythonPackage rec {
  pname = "puremagic";
-  version = "1.14";
+  version = "1.15";
  format = "setuptools";

  disabled = pythonOlder "3.7";

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw=";
+  src = fetchFromGitHub {
+    owner = "cdgriffith";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg=";
  };

-  # test data not included on pypi
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];

  pythonImportsCheck = [
    "puremagic"
@ -26,6 +30,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Implementation of magic file detection";
    homepage = "https://github.com/cdgriffith/puremagic";
+    changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ globin ];
  };
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@ -26,9 +26,7 @@ buildPythonPackage rec {
  ];

  # Work around Python distutils compiling C++ with $CC (see issue #26709)
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [
-    "-I${lib.getDev libcxx}/include/c++/v1"
-  ];
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

  pythonImportsCheck = [
    "pyexiv2"
--- a/pkgs/development/python-modules/pydrive2/default.nix
+++ b/pkgs/development/python-modules/pydrive2/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pydrive2";
-  version = "1.15.0";
+  version = "1.15.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "PyDrive2";
    inherit version;
-    hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw=";
+    hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pykakasi/default.nix
+++ b/pkgs/development/python-modules/pykakasi/default.nix
@ -4,6 +4,7 @@
 , fetchFromGitHub
 , importlib-metadata
 , jaconv
+, py-cpuinfo
 , pytest-benchmark
 , pytestCheckHook
 , pythonOlder
@ -20,8 +21,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "miurahr";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM==";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -38,6 +39,7 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
+    py-cpuinfo
    pytest-benchmark
    pytestCheckHook
  ];
@ -56,6 +58,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman";
    homepage = "https://github.com/miurahr/pykakasi";
+    changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix
+++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "pysnmp-pyasn1";
-  version = "1.1.2";
+  version = "1.1.3";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "pysnmp";
    repo = "pyasn1";
-    rev = "v${version}";
-    hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI=";
  };

  nativeBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python ASN.1 encoder and decoder";
    homepage = "https://github.com/pysnmp/pyasn1";
+    changelog = "https://github.com/pysnmp/pyasn1/releases/tag/v${version}";
    license = licenses.bsd2;
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "pyspark";
-  version = "3.3.1";
+  version = "3.3.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-6Z+n3pK+QGiEv9gxwyuTBqOpneRM/Dmi7vtu0HRF1fo=";
+    hash = "sha256-Df1dtDAMH2zJwW2NvfuC2IG0sXKYTacTRO3hqdSJPag=";
  };

  # pypandoc is broken with pandoc2, so we just lose docs.
--- a/Show More
+++ b/Show More