Merge master into staging-next

2023-02-28 06:01:06 +00:00
parent 48c9797748 9e56d6ec92
commit f610d5f5d6
64 changed files with 1213 additions and 938 deletions
@@ -299,17 +299,51 @@ in {
                '';
              };

-              domain_map = mkOption {
-                type = types.attrsOf types.str;
-                default = {};
+              scope = mkOption {
+                type = types.listOf types.str;
+                default = ["openid" "profile" "email"];
                description = lib.mdDoc ''
-                  Domain map is used to map incomming users (by their email) to
-                  a namespace. The key can be a string, or regex.
+                  Scopes used in the OIDC flow.
+                '';
+              };
+
+              extra_params = mkOption {
+                type = types.attrsOf types.str;
+                default = { };
+                description = lib.mdDoc ''
+                  Custom query parameters to send with the Authorize Endpoint request.
                '';
                example = {
-                  ".*" = "default-namespace";
+                  domain_hint = "example.com";
                };
              };
+
+              allowed_domains = mkOption {
+                type = types.listOf types.str;
+                default = [ ];
+                description = lib.mdDoc ''
+                  Allowed principal domains. if an authenticated user's domain
+                  is not in this list authentication request will be rejected.
+                '';
+                example = [ "example.com" ];
+              };
+
+              allowed_users = mkOption {
+                type = types.listOf types.str;
+                default = [ ];
+                description = lib.mdDoc ''
+                  Users allowed to authenticate even if not in allowedDomains.
+                '';
+                example = [ "alice@example.com" ];
+              };
+
+              strip_email_domain = mkOption {
+                type = types.bool;
+                default = true;
+                description = lib.mdDoc ''
+                  Whether the domain part of the email address should be removed when generating namespaces.
+                '';
+              };
            };

            tls_letsencrypt_hostname = mkOption {
@@ -392,13 +426,16 @@ in {
    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "issuer"] ["services" "headscale" "settings" "oidc" "issuer"])
    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientId"] ["services" "headscale" "settings" "oidc" "client_id"])
    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientSecretFile"] ["services" "headscale" "settings" "oidc" "client_secret_file"])
-    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "domainMap"] ["services" "headscale" "settings" "oidc" "domain_map"])
    (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "hostname"] ["services" "headscale" "settings" "tls_letsencrypt_hostname"])
    (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "challengeType"] ["services" "headscale" "settings" "tls_letsencrypt_challenge_type"])
    (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "httpListen"] ["services" "headscale" "settings" "tls_letsencrypt_listen"])
    (mkRenamedOptionModule ["services" "headscale" "tls" "certFile"] ["services" "headscale" "settings" "tls_cert_path"])
    (mkRenamedOptionModule ["services" "headscale" "tls" "keyFile"] ["services" "headscale" "settings" "tls_key_path"])
    (mkRenamedOptionModule ["services" "headscale" "aclPolicyFile"] ["services" "headscale" "settings" "acl_policy_path"])
+
+    (mkRemovedOptionModule ["services" "headscale" "openIdConnect" "domainMap"] ''
+      Headscale no longer uses domain_map. If you're using an old version of headscale you can still set this option via services.headscale.settings.oidc.domain_map.
+    '')
  ];

  config = mkIf cfg.enable {
@@ -131,8 +131,7 @@ in rec {
        (onFullSupported "nixos.tests.networking.networkd.virtual")
        (onFullSupported "nixos.tests.networking.networkd.vlan")
        (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation")
-        # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
-        #(onFullSupported "nixos.tests.nfs3.simple")
+        (onFullSupported "nixos.tests.nfs3.simple")
        (onFullSupported "nixos.tests.nfs4.simple")
        (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman")
        (onFullSupported "nixos.tests.openssh")
@@ -39,8 +39,7 @@ in rec {
        login
        misc
        nat
-        # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
-        #nfs3
+        nfs3
        openssh
        php
        predictable-interface-names
@@ -122,8 +121,7 @@ in rec {
        "nixos.tests.nat.firewall-conntrack"
        "nixos.tests.nat.firewall"
        "nixos.tests.nat.standalone"
-        # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
-        #"nixos.tests.nfs3.simple"
+        "nixos.tests.nfs3.simple"
        "nixos.tests.openssh"
        "nixos.tests.php.fpm"
        "nixos.tests.php.pcre"
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "wolf-shaper";
-  version = "1.0.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "pdesaulniers";
    repo = "wolf-shaper";
    rev = "v${version}";
-    sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI=";
+    sha256 = "sha256-xy6ZebabTRLo/Xk2OMoR4xtxmZsqYXaUHUebuDrHOvA=";
    fetchSubmodules = true;
  };

@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.185.0";
+  version = "1.186.0";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-hzEDKpH1dShmEZ6EYkA5rLtbJc2ukw7Gs7spMjiocCE=";
+    hash = "sha256-CzCPz/Bny57nkxR21ACXjhAoplVVm4TVSbH6De+fKfI=";
  };

  postPatch = ''
@@ -16,8 +16,8 @@
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2023.02.19",
-    "hash": "sha256-2qNY7xzyJ0rCVNDQcJaJ7qZgOhtBCcuGCxY1BvVAoEs="
+    "rev": "2023.02.25",
+    "hash": "sha256-iTdb+eI1alS6chCn2rEbUAy9iVAgVvsNGURxds/2f7s="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
@@ -26,8 +26,8 @@
  },
  "EControl": {
    "owner": "Alexey-T",
-    "rev": "2023.01.18",
-    "hash": "sha256-5R4ZHMTfmIF0VnwOFNOV/i6Dc91yk5dVNcFNrxMMzm0="
+    "rev": "2023.02.25",
+    "hash": "sha256-09jTp0pFbiQ268xB/eDUj98t8WYjzGaTiHdFvWlmoR0="
  },
  "ATSynEdit_Ex": {
    "owner": "Alexey-T",
@@ -1,10 +1,10 @@
 { appimageTools, fetchurl, lib }:
 let
  pname = "protonup-qt";
-  version = "2.7.4";
+  version = "2.7.7";
  src = fetchurl {
    url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
-    sha256 = "yKc+KOQfqciqULnChVLf6y9npoSYM6Fmu7mYGEKmpkA=";
+    sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto=";
  };
  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -438,24 +438,24 @@
    "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM="
  },
  "google": {
-    "hash": "sha256-sFfL/PcX5a2tWKo3VxGCM8pJUH18Up70Y/1NXgvNgRw=",
+    "hash": "sha256-my7vlk1EBQizQy2i+77Sf4OyOh+64GSDruzCfOc1QTc=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google",
    "owner": "hashicorp",
    "proxyVendor": true,
    "repo": "terraform-provider-google",
-    "rev": "v4.54.0",
+    "rev": "v4.55.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
+    "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E="
  },
  "google-beta": {
-    "hash": "sha256-x2cTM3xtOP40T6GSHy/UR0/B8CBQlEUsyd9A/wvmJqM=",
+    "hash": "sha256-uZuoWORRK0Y+r6OM6KhAts7/yPWJDkOtMwELFV/2hYE=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
    "owner": "hashicorp",
    "proxyVendor": true,
    "repo": "terraform-provider-google-beta",
-    "rev": "v4.54.0",
+    "rev": "v4.55.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
+    "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E="
  },
  "googleworkspace": {
    "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -648,13 +648,13 @@
    "vendorHash": null
  },
  "launchdarkly": {
-    "hash": "sha256-41lGYGf2t9q5tLHZbL2IksmYAy4Dw3nBZuiSOuG9/r8=",
+    "hash": "sha256-3zQN7cc4p5ivjPxiIqdv6e/m+2KnhwiLhwSa6RAQ1sk=",
    "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
    "owner": "launchdarkly",
    "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.9.5",
+    "rev": "v2.10.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk="
+    "vendorHash": "sha256-x5C+WimWRBJQiOwsy+Woop1U6a7nSnO0rDoy4UU6j+4="
  },
  "libvirt": {
    "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=",
@@ -729,13 +729,13 @@
    "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
  },
  "minio": {
-    "hash": "sha256-dfbmjl5gqffSE1sg5QEwzzbMXoL4bEKSFxU1bEdSMPs=",
+    "hash": "sha256-zfnldsJcr36RMwEcmoDiwko1f+VR9tlPVUe/OVgX4Bc=",
    "homepage": "https://registry.terraform.io/providers/aminueza/minio",
    "owner": "aminueza",
    "repo": "terraform-provider-minio",
-    "rev": "v1.11.0",
+    "rev": "v1.12.0",
    "spdx": "Apache-2.0",
-    "vendorHash": "sha256-M2MlZNS4o1/GhQYiI72JVuhgfbNwa5ERFJjhB3nTpmE="
+    "vendorHash": "sha256-MLhHRMahJjTgQBzYkSaVv6wFm6b+YgpkitBHuj5B6po="
  },
  "mongodbatlas": {
    "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=",
@@ -765,13 +765,13 @@
    "vendorHash": null
  },
  "newrelic": {
-    "hash": "sha256-OUcSegGIiXNKC5FCB9+4tnsNGiEIxBFX1UZLLwxsHwM=",
+    "hash": "sha256-ReVP0droWSP+NWV0kQznfCllL/jx0uQKmaGr+CyR8iQ=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.14.0",
+    "rev": "v3.15.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-AR62fegcN9+qTuKwGbb8cEem8nsjgRQkYm3R3VNzYKA="
+    "vendorHash": "sha256-aFjsUhdGboN8Hfu2ky6djG0hC/Z9MU2tOWDFXekOGNQ="
  },
  "nomad": {
    "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",
@@ -1045,11 +1045,11 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
-    "hash": "sha256-u+wOQwLejlS8Bap8M92wu1jdc0NAemnJsUjNIacGX+A=",
+    "hash": "sha256-mbO0APaGWLHowhs5tDvloUBYKt4+pvx3qqN2gtrAzGY=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.100.0",
+    "rev": "v1.101.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU="
  },
@@ -1072,13 +1072,13 @@
    "vendorHash": "sha256-0D36uboEHqw968MKqkgARib9R04JH5FlXAfPL8OEpgU="
  },
  "sumologic": {
-    "hash": "sha256-4M8h1blefSNNTgt7aL7ecruguEWcZUrzsXGZX3AC2Hc=",
+    "hash": "sha256-1BwhcyEJs7Xm+p2ChA9K7g+qBzqoh3eyAT9qKMfHB1g=",
    "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
    "owner": "SumoLogic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v2.20.0",
+    "rev": "v2.21.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag="
+    "vendorHash": "sha256-dpMa+XnfavXO0lXiBZOsU+O+5/3a/IMkfzpQcnD/sSw="
  },
  "tailscale": {
    "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=",
@@ -1099,11 +1099,11 @@
    "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="
  },
  "tencentcloud": {
-    "hash": "sha256-f6GdDTezh1lDNppCLmjx/7jiKsq2yZoR92kYpGAAldQ=",
+    "hash": "sha256-aqi6lEGVj0PhIMwUfU/4lu5uGgbU4+R42UhINbHgMjY=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.79.11",
+    "rev": "v1.79.12",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1163,11 +1163,11 @@
    "vendorHash": null
  },
  "ucloud": {
-    "hash": "sha256-S0pSri0NfxxaYfifUEUVAoEIRPE8y2/sCNdXCLIDGh0=",
+    "hash": "sha256-Rh1X4AboPlHWikL/PIWTAf0f2/i3vSVsxzDp1kRuNiA=",
    "homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
    "owner": "ucloud",
    "repo": "terraform-provider-ucloud",
-    "rev": "v1.34.0",
+    "rev": "v1.34.1",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -41,12 +41,12 @@

 stdenv.mkDerivation rec {
  pname = "zotero";
-  version = "6.0.20";
+  version = "6.0.22";

  src = fetchurl {
    url =
      "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w=";
+    sha256 = "sha256-OXlX4E5C6UEDR3+fDYB3O5isO8vABpd6hvrq+4kZ1iA=";
  };

  nativeBuildInputs = [ wrapGAppsHook ];
@@ -3,14 +3,14 @@
 let
  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-domain-list-community";
-    version = "20230202101858";
+    version = "20230227064844";
    src = fetchFromGitHub {
      owner = "v2fly";
      repo = "domain-list-community";
      rev = version;
-      hash = "sha256-9K3Tjm1tVw5KJgT6UFcVmn/JzQidKCaQyC4EFX23QE0=";
+      hash = "sha256-popSTy1BXKUhWtYePlERVqui+wiltyTaYk7071z08i8=";
    };
-    vendorHash = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
+    vendorHash = "sha256-wqOpZ5MSWN3L+rVKdA2E/Zbwqb/KHwMKoGlSIPBKgv0=";
    meta = with lib; {
      description = "community managed domain list";
      homepage = "https://github.com/v2fly/domain-list-community";
@@ -56,14 +56,14 @@ let
  cmakeFeatureFlag = feature: flag:
    "-D${feature}=${if flag then "on" else "off"}";
 in
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (self: {
  pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
  version = "0.6.2.1";

  src = fetchFromGitHub {
    owner = "letoram";
    repo = "arcan";
-    rev = finalAttrs.version;
+    rev = self.version;
    hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM=";
  };

@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-DBUILD_PRESET=everything"
    # The upstream project recommends tagging the distribution
    "-DDISTR_TAG=Nixpkgs"
-    "-DENGINE_BUILDTAG=${finalAttrs.version}"
+    "-DENGINE_BUILDTAG=${self.version}"
    (cmakeFeatureFlag "HYBRID_SDL" true)
    (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua)
    (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua)
@@ -3,15 +3,15 @@
 , fetchFromGitHub
 }:

-stdenvNoCC.mkDerivation (finalPackages: {
+stdenvNoCC.mkDerivation (self: {
  pname = "cat9";
-  version = "unstable-2018-09-13";
+  version = "unstable-2023-02-11";

  src = fetchFromGitHub {
    owner = "letoram";
-    repo = finalPackages.pname;
-    rev = "754d9d2900d647a0fa264720528117471a32f295";
-    hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY=";
+    repo = "cat9";
+    rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897";
+    hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ=";
  };

  dontConfigure = true;
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalPackages: {
  meta = with lib; {
    homepage = "https://github.com/letoram/cat9";
    description = "A User shell for LASH";
-    license = licenses.bsd3;
+    license = licenses.unlicense;
    maintainers = with maintainers; [ AndersonTorres ];
    platforms = platforms.all;
  };
@@ -3,15 +3,15 @@
 , fetchFromGitHub
 }:

-stdenvNoCC.mkDerivation (finalPackages: {
+stdenvNoCC.mkDerivation (self: {
  pname = "durden";
-  version = "unstable-2022-10-16";
+  version = "unstable-2023-01-19";

  src = fetchFromGitHub {
    owner = "letoram";
    repo = "durden";
-    rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8";
-    hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o=";
+    rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2";
+    hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA=";
  };

  dontConfigure = true;
@@ -5,13 +5,13 @@

 stdenvNoCC.mkDerivation (finalPackages: {
  pname = "pipeworld";
-  version = "unstable-2022-04-03";
+  version = "unstable-2023-02-05";

  src = fetchFromGitHub {
    owner = "letoram";
    repo = "pipeworld";
-    rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef";
-    hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E=";
+    rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e";
+    hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM=";
  };

  dontConfigure = true;
@@ -3,13 +3,13 @@
 , fetchFromGitHub
 }:

-stdenvNoCC.mkDerivation (finalPackages: {
+stdenvNoCC.mkDerivation (self: {
  pname = "prio";
  version = "unstable-2018-09-13";

  src = fetchFromGitHub {
    owner = "letoram";
-    repo = finalPackages.pname;
+    repo = "prio";
    rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1";
    hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";
  };
@@ -65,13 +65,13 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    # disabled until recommonmark supports sphinx 3
    #Llvm-manpages = lowPrio (tools.libllvm.override {
@@ -67,7 +67,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -80,7 +80,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    clang-polly-unwrapped = callPackage ./clang {
      inherit llvm_meta;
@@ -68,13 +68,13 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    # disabled until recommonmark supports sphinx 3
    #Llvm-manpages = lowPrio (tools.libllvm.override {
@@ -70,13 +70,13 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -70,13 +70,13 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -119,13 +119,13 @@ in let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -41,7 +41,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -54,7 +54,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -41,7 +41,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -54,7 +54,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -65,7 +65,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -78,7 +78,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    clang-polly-unwrapped = callPackage ./clang {
      inherit llvm_meta;
@@ -65,7 +65,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -78,7 +78,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    clang-polly-unwrapped = callPackage ./clang {
      inherit llvm_meta;
@@ -65,7 +65,7 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libllvm-polly = callPackage ./llvm {
      inherit llvm_meta;
@@ -78,7 +78,7 @@ let
      inherit clang-tools-extra_src llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    clang-polly-unwrapped = callPackage ./clang {
      inherit llvm_meta;
@@ -69,13 +69,13 @@ let

    # `llvm` historically had the binaries.  When choosing an output explicitly,
    # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-    llvm = tools.libllvm.out // { outputSpecified = false; };
+    llvm = tools.libllvm;

    libclang = callPackage ./clang {
      inherit llvm_meta;
    };

-    clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
+    clang-unwrapped = tools.libclang;

    llvm-manpages = lowPrio (tools.libllvm.override {
      enableManpages = true;
@@ -32,6 +32,10 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux
       else if stdenv.hostPlatform.isBSD then "bsd"
       else if stdenv.hostPlatform.isUnix then "posix"
       else "generic";
+
+compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_ALL"
+              else if (lib.versionOlder self.luaversion "5.4") then " -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
+              else " -DLUA_COMPAT_5_3";
 in

 stdenv.mkDerivation rec {
@@ -89,7 +93,7 @@ stdenv.mkDerivation rec {
  configurePhase = ''
    runHook preConfigure

-    makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(${
+    makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${
      if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' )
    makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"})

@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
      composited rendering via XComposite, as well as support for
      rendering Cairo and Pango layouts.
    '';
+    broken = stdenv.isDarwin;
    homepage = "https://github.com/atheme-legacy/libaosd";
    license = licenses.mit;
    maintainers = with maintainers; [ unode ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  patches = [
-    ./hdf5-1.12.patch
+    ./hdf5-1.14.patch
  ];

  nativeBuildInputs = [ cmake ];
@@ -25,7 +25,7 @@
 #error "Don't forget to update the test version here when you change the major version of the library !"
 #endif
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
 #error "Cf. _MEDfileCreate ..."
 #endif
@@ -36,7 +36,7 @@
    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
    */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to change the compatibility version of the library !"
 #endif
    
@@ -47,7 +47,7 @@
    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
   */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to change the compatibility version of the library !"
 #endif
 /* L'avantage de bloquer le modèle interne HDF5 
@@ -58,7 +58,7 @@
   }
 
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to change the compatibility version of the library !"
 #endif
   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
@@ -69,7 +69,7 @@
    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
    */
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to change the compatibility version of the library !"
 #endif
    
@@ -80,7 +80,7 @@
     goto ERROR;
   }
 -#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
 #error "Don't forget to change the compatibility version of the library !"
 #endif
   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ninja ];
  buildInputs = [ netcdf hdf5 curl ];

-  # 10 - cxx4_test_filter (Failed)
-  # Setting Filter....Caught unexpected exception.
-  doCheck = false;
+  doCheck = true;
  enableParallelChecking = false;
+  preCheck = ''
+    export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins
+  '';

  meta = {
    description = "C++ API to manipulate netcdf files";
@@ -1,6 +1,11 @@
 { lib, stdenv
 , fetchurl, unzip
 , hdf5
+, bzip2
+, libzip
+, zstd
+, szipSupport ? false
+, szip
 , libxml2
 , m4
 , curl # for DAP
@@ -34,7 +39,10 @@ in stdenv.mkDerivation rec {
    hdf5
    libxml2
    mpi
-  ];
+    bzip2
+    libzip
+    zstd
+  ] ++ lib.optional szipSupport szip;

  passthru = {
    inherit mpiSupport mpi;
@@ -45,9 +53,12 @@ in stdenv.mkDerivation rec {
      "--enable-dap"
      "--enable-shared"
      "--disable-dap-remote-tests"
+      "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"
  ]
  ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);

+  enableParallelBuilding = true;
+
  disallowedReferences = [ stdenv.cc ];

  postFixup = ''
@@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "nghttp3";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "ngtcp2";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Zexcfkf8Br3wduUpM3tcS68fEVO6reNxYSB3X3qUWKg=";
+    sha256 = "sha256-N4wgk21D1I0tNrKoTGWBtq3neeamCI8axQnFxdT1Txg=";
  };

  outputs = [ "out" "dev" "doc" ];
@@ -1,249 +1,80 @@
+# Support matrix can be found at
+# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
+# Type aliases
+# Release = {
+#   version: String,
+#   minCudaVersion: String,
+#   maxCudaVersion: String,
+#   url: String,
+#   hash: String,
+# }
 final: prev: let
-
  inherit (final) callPackage;
-  inherit (prev) cudatoolkit cudaVersion lib pkgs;
-  inherit (prev.lib.versions) major;
+  inherit (prev) cudaVersion;
+  inherit (prev.lib) attrsets lists versions strings trivial;

-  ### CuDNN
+  # Utilities
+  # majorMinorPatch :: String -> String
+  majorMinorPatch = (trivial.flip trivial.pipe) [
+    (versions.splitVersion)
+    (lists.take 3)
+    (strings.concatStringsSep ".")
+  ];

-  buildCuDnnPackage = args:
-    let
-      useCudatoolkitRunfile = lib.versionOlder cudaVersion "11.3.999";
-    in
-    callPackage ./generic.nix { inherit useCudatoolkitRunfile; } args;
+  # Compute versioned attribute name to be used in this package set
+  # computeName :: String -> String
+  computeName = version: "cudnn_${strings.replaceStrings ["."] ["_"] (majorMinorPatch version)}";

-  toUnderscore = str: lib.replaceStrings ["."] ["_"] str;
+  # Check whether a CUDNN release supports our CUDA version
+  # Thankfully we're able to do lexicographic comparison on the version strings
+  # isSupported :: Release -> Bool
+  isSupported = release:
+    strings.versionAtLeast cudaVersion release.minCudaVersion
+    && strings.versionAtLeast release.maxCudaVersion cudaVersion;

-  majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str));
+  # useCudatoolkitRunfile :: Bool
+  useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999";

-  cuDnnPackages = with lib; let
-    # Check whether a file is supported for our cuda version
-    isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions;
-    # Return the first file that is supported. In practice there should only ever be one anyway.
-    supportedFile = files: findFirst isSupported null files;
-    # Supported versions with versions as keys and file as value
-    supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) cuDnnVersions);
-    # Compute versioned attribute name to be used in this package set
-    computeName = version: "cudnn_${toUnderscore version}";
-    # Add all supported builds as attributes
-    allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildCuDnnPackage (removeAttrs file ["fileVersion"]))) supportedVersions;
-    # Set the default attributes, e.g. cudnn = cudnn_8_3_1;
-    defaultBuild = { "cudnn" = if allBuilds ? ${computeName cuDnnDefaultVersion}
-      then allBuilds.${computeName cuDnnDefaultVersion}
-      else throw "cudnn-${cuDnnDefaultVersion} does not support your cuda version ${cudaVersion}"; };
-  in allBuilds // defaultBuild;
+  # buildCuDnnPackage :: Release -> Derivation
+  buildCuDnnPackage = callPackage ./generic.nix {inherit useCudatoolkitRunfile;};

-  cuDnnVersions = let
-    urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn";
-  in {
-    "7.4.2" = [
-      rec {
-        fileVersion = "10.0";
-        fullVersion = "7.4.2.24";
-        hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-10.0-linux-x64-v${fullVersion}.tgz";
-        supportedCudaVersions = [ "10.0" ];
-      }
-    ];
-    "7.6.5" = [
-      rec {
-        fileVersion = "10.0";
-        fullVersion = "7.6.5.32";
-        hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
-        supportedCudaVersions = [ "10.0" ];
-      }
-      rec {
-        fileVersion = "10.1";
-        fullVersion = "7.6.5.32";
-        hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
-        supportedCudaVersions = [ "10.1" ];
-      }
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "7.6.5.32";
-        hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
-        supportedCudaVersions = [ "10.2" ];
-      }
-    ];
-    "8.0.5" = [
-      rec {
-        fileVersion = "10.1";
-        fullVersion = "8.0.5.39";
-        hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html
-        supportedCudaVersions = [ "10.1" ];
-      }
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.0.5.39";
-        hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.0";
-        fullVersion = "8.0.5.39";
-        hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" ];
-      }
-      rec {
-        fileVersion = "11.1";
-        fullVersion = "8.0.5.39";
-        hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html
-        supportedCudaVersions = [ "11.1" ];
-      }
-    ];
-    "8.1.1" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.1.1.33";
-        hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.2";
-        fullVersion = "8.1.1.33";
-        hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" ];
-      }
-    ];
-    "8.2.4" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.2.4.15";
-        hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.4";
-        fullVersion = "8.2.4.15";
-        hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html
-        supportedCudaVersions = [  "11.0" "11.1" "11.2" "11.3" "11.4" ];
-      }
-    ];
-    "8.3.3" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.3.3.40";
-        hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.5";
-        fullVersion = "8.3.3.40";
-        hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ];
-      }
-    ];
-    "8.4.1" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.4.1.50";
-        hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.6";
-        fullVersion = "8.4.1.50";
-        hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
-      }
-    ];
-    "8.5.0" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.5.0.96";
-        hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.7";
-        fullVersion = "8.5.0.96";
-        hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
-      }
-    ];
-    "8.6.0" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.6.0.163";
-        hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.8";
-        fullVersion = "8.6.0.163";
-        hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
-      }
-    ];
-    "8.7.0" = [
-      rec {
-        fileVersion = "10.2";
-        fullVersion = "8.7.0.84";
-        hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html
-        supportedCudaVersions = [ "10.2" ];
-      }
-      rec {
-        fileVersion = "11.8";
-        fullVersion = "8.7.0.84";
-        hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920=";
-        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
-        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
-      }
-    ];
+  # Reverse the list to have the latest release first
+  # cudnnReleases :: List Release
+  cudnnReleases = lists.reverseList (builtins.import ./releases.nix);
+
+  # Check whether a CUDNN release supports our CUDA version
+  # supportedReleases :: NonEmptyList Release
+  supportedReleases = let
+    filtered = builtins.filter isSupported cudnnReleases;
+    nonEmptyFiltered =
+      trivial.throwIf (filtered == [])
+      ''
+        CUDNN does not support your cuda version ${cudaVersion}
+      ''
+      filtered;
+  in
+    nonEmptyFiltered;
+
+  # The latest release is the first element of the list and will be our default choice
+  # latestReleaseName :: String
+  latestReleaseName = computeName (builtins.head supportedReleases).version;
+
+  # Function to transform our releases into build attributes
+  # toBuildAttrs :: Release -> { name: String, value: Derivation }
+  toBuildAttrs = release: {
+    name = computeName release.version;
+    value = buildCuDnnPackage release;
  };

-  # Default attributes
-  cuDnnDefaultVersion = {
-    "10.0" = "7.4.2";
-    "10.1" = "8.0.5";
-    "10.2" = "8.7.0";
-    "11.0" = "8.7.0";
-    "11.1" = "8.7.0";
-    "11.2" = "8.7.0";
-    "11.3" = "8.7.0";
-    "11.4" = "8.7.0";
-    "11.5" = "8.7.0";
-    "11.6" = "8.7.0";
-    "11.7" = "8.7.0";
-    "11.8" = "8.7.0";
-  }.${cudaVersion} or "8.7.0";
+  # Add all supported builds as attributes
+  # allBuilds :: AttrSet String Derivation
+  allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases);

-in cuDnnPackages
+  # The latest release will be our default build
+  # defaultBuild :: AttrSet String Derivation
+  defaultBuild.cudnn = allBuilds.${latestReleaseName};
+
+  # builds :: AttrSet String Derivation
+  builds = allBuilds // defaultBuild;
+in
+  builds
@@ -1,113 +1,128 @@
-{ stdenv
-, lib
-, zlib
-, useCudatoolkitRunfile ? false
-, cudaVersion
-, cudaMajorVersion
-, cudatoolkit # if cuda>=11: only used for .cc
-, libcublas ? null # cuda <11 doesn't ship redist packages
-, autoPatchelfHook
-, autoAddOpenGLRunpathHook
-, fetchurl
-, # The distributed version of CUDNN includes both dynamically liked .so files,
+{
+  stdenv,
+  lib,
+  zlib,
+  useCudatoolkitRunfile ? false,
+  cudaVersion,
+  cudaMajorVersion,
+  cudatoolkit, # if cuda>=11: only used for .cc
+  libcublas ? null, # cuda <11 doesn't ship redist packages
+  autoPatchelfHook,
+  autoAddOpenGLRunpathHook,
+  fetchurl,
+  # The distributed version of CUDNN includes both dynamically liked .so files,
  # as well as statically linked .a files.  However, CUDNN is quite large
  # (multiple gigabytes), so you can save some space in your nix store by
  # removing the statically linked libraries if you are not using them.
  #
  # Setting this to true removes the statically linked .a files.
  # Setting this to false keeps these statically linked .a files.
-  removeStatic ? false
+  removeStatic ? false,
+}: {
+  version,
+  url,
+  hash,
+  minCudaVersion,
+  maxCudaVersion,
 }:
-
-{ fullVersion
-, url
-, hash
-, supportedCudaVersions ? [ ]
-}:
-
-assert useCudatoolkitRunfile || (libcublas != null);
-
-let
+assert useCudatoolkitRunfile || (libcublas != null); let
  inherit (cudatoolkit) cc;
+  inherit (lib) lists strings trivial versions;

-  majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));
-  version = majorMinorPatch fullVersion;
+  # majorMinorPatch :: String -> String
+  majorMinorPatch = (trivial.flip trivial.pipe) [
+    (versions.splitVersion)
+    (lists.take 3)
+    (strings.concatStringsSep ".")
+  ];

+  # versionTriple :: String
+  # Version with three components: major.minor.patch
+  versionTriple = majorMinorPatch version;
+
+  # cudatoolkit_root :: Derivation
  cudatoolkit_root =
    if useCudatoolkitRunfile
    then cudatoolkit
    else libcublas;
 in
-stdenv.mkDerivation {
-  pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
-  inherit version;
+  stdenv.mkDerivation {
+    pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
+    version = versionTriple;

-  src = fetchurl {
-    inherit url hash;
-  };
+    src = fetchurl {
+      inherit url hash;
+    };

-  # Check and normalize Runpath against DT_NEEDED using autoPatchelf.
-  # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so")
-  nativeBuildInputs = [
-    autoPatchelfHook
-    autoAddOpenGLRunpathHook
-  ];
+    # Check and normalize Runpath against DT_NEEDED using autoPatchelf.
+    # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so")
+    nativeBuildInputs = [
+      autoPatchelfHook
+      autoAddOpenGLRunpathHook
+    ];

-  # Used by autoPatchelfHook
-  buildInputs = [
-    cc.cc.lib # libstdc++
-    zlib
-    cudatoolkit_root
-  ];
+    # Used by autoPatchelfHook
+    buildInputs = [
+      cc.cc.lib # libstdc++
+      zlib
+      cudatoolkit_root
+    ];

-  # We used to patch Runpath here, but now we use autoPatchelfHook
-  #
-  # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in
-  # version 8.3.2 it seems to have been renamed to simply "lib/".
-  installPhase = ''
-    runHook preInstall
+    # We used to patch Runpath here, but now we use autoPatchelfHook
+    #
+    # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in
+    # version 8.3.2 it seems to have been renamed to simply "lib/".
+    installPhase =
+      ''
+        runHook preInstall

-    mkdir -p $out
-    cp -a include $out/include
-    [ -d "lib/" ] && cp -a lib $out/lib
-    [ -d "lib64/" ] && cp -a lib64 $out/lib64
-  '' + lib.optionalString removeStatic ''
-    rm -f $out/lib/*.a
-    rm -f $out/lib64/*.a
-  '' + ''
-    runHook postInstall
-  '';
+        mkdir -p $out
+        cp -a include $out/include
+        [ -d "lib/" ] && cp -a lib $out/lib
+        [ -d "lib64/" ] && cp -a lib64 $out/lib64
+      ''
+      + strings.optionalString removeStatic ''
+        rm -f $out/lib/*.a
+        rm -f $out/lib64/*.a
+      ''
+      + ''
+        runHook postInstall
+      '';

-  # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5.
-  postFixup = lib.optionalString (lib.versionAtLeast fullVersion "8.0.5") ''
-    patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
-  '';
+    # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5.
+    postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") ''
+      patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
+    '';

-  passthru = {
-    inherit useCudatoolkitRunfile;
+    passthru = {
+      inherit useCudatoolkitRunfile;

-    cudatoolkit = lib.warn ''
-      cudnn.cudatoolkit passthru attribute is deprecated;
-      if your derivation uses cudnn directly, it should probably consume cudaPackages instead
-    ''
-      cudatoolkit;
+      cudatoolkit =
+        trivial.warn
+        ''
+          cudnn.cudatoolkit passthru attribute is deprecated;
+          if your derivation uses cudnn directly, it should probably consume cudaPackages instead
+        ''
+        cudatoolkit;

-    majorVersion = lib.versions.major version;
-  };
+      majorVersion = versions.major versionTriple;
+    };

-  meta = with lib; {
-    # Check that the cudatoolkit version satisfies our min/max constraints (both
-    # inclusive). We mark the package as broken if it fails to satisfies the
-    # official version constraints (as recorded in default.nix). In some cases
-    # you _may_ be able to smudge version constraints, just know that you're
-    # embarking into unknown and unsupported territory when doing so.
-    broken = !(elem cudaVersion supportedCudaVersions);
-    description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    homepage = "https://developer.nvidia.com/cudnn";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    # TODO: consider marking unfreRedistributable when not using runfile
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ mdaiter samuela ];
-  };
-}
+    meta = with lib; {
+      # Check that the cudatoolkit version satisfies our min/max constraints (both
+      # inclusive). We mark the package as broken if it fails to satisfies the
+      # official version constraints (as recorded in default.nix). In some cases
+      # you _may_ be able to smudge version constraints, just know that you're
+      # embarking into unknown and unsupported territory when doing so.
+      broken =
+        strings.versionOlder cudaVersion minCudaVersion
+        || strings.versionOlder maxCudaVersion cudaVersion;
+      description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
+      homepage = "https://developer.nvidia.com/cudnn";
+      sourceProvenance = with sourceTypes; [binaryNativeCode];
+      # TODO: consider marking unfreRedistributable when not using runfile
+      license = licenses.unfree;
+      platforms = ["x86_64-linux"];
+      maintainers = with maintainers; [mdaiter samuela];
+    };
+  }
@@ -0,0 +1,170 @@
+[
+  {
+    version = "7.4.2.24";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "10.0";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz";
+    hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM=";
+  }
+  {
+    version = "7.6.5.32";
+    minCudaVersion = "10.0";
+    maxCudaVersion = "10.0";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz";
+    hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro=";
+  }
+  {
+    version = "7.6.5.32";
+    minCudaVersion = "10.1";
+    maxCudaVersion = "10.1";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz";
+    hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM=";
+  }
+  {
+    version = "7.6.5.32";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz";
+    hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN=";
+  }
+  {
+    version = "8.0.5.39";
+    minCudaVersion = "10.1";
+    maxCudaVersion = "10.1";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz";
+    hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA=";
+  }
+  {
+    version = "8.0.5.39";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz";
+    hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM=";
+  }
+  {
+    version = "8.0.5.39";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.0";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.0-linux-x64-v8.0.5.39.tgz";
+    hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M=";
+  }
+  {
+    version = "8.0.5.39";
+    minCudaVersion = "11.1";
+    maxCudaVersion = "11.1";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz";
+    hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4=";
+  }
+  {
+    version = "8.1.1.33";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz";
+    hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0=";
+  }
+  {
+    version = "8.1.1.33";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz";
+    hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
+  }
+  {
+    version = "8.2.4.15";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz";
+    hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE=";
+  }
+  {
+    version = "8.2.4.15";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.4";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz";
+    hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc=";
+  }
+  {
+    version = "8.3.3.40";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz";
+    hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs=";
+  }
+  {
+    version = "8.3.3.40";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.6";
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz";
+    hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE=";
+  }
+  {
+    version = "8.4.1.50";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz";
+    hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg=";
+  }
+  {
+    version = "8.4.1.50";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.7";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz";
+    hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE=";
+  }
+  {
+    version = "8.5.0.96";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz";
+    hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM=";
+  }
+  {
+    version = "8.5.0.96";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.7";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz";
+    hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20=";
+  }
+  {
+    version = "8.6.0.163";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz";
+    hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k=";
+  }
+  {
+    version = "8.6.0.163";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.8";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz";
+    hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4=";
+  }
+  {
+    version = "8.7.0.84";
+    minCudaVersion = "10.2";
+    maxCudaVersion = "10.2";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz";
+    hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg=";
+  }
+  {
+    version = "8.7.0.84";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.8";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz";
+    hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920=";
+  }
+  {
+    version = "8.8.0.121";
+    minCudaVersion = "11.0";
+    maxCudaVersion = "11.8";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.0.121_cuda11-archive.tar.xz";
+    hash = "sha256-YgRkdgdtG0VfsT+3izjTSWusr7/bsElPszkiQKBEZuo=";
+  }
+  {
+    version = "8.8.0.121";
+    minCudaVersion = "12.0";
+    maxCudaVersion = "12.0";
+    url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.0.121_cuda12-archive.tar.xz";
+    hash = "sha256-oHkrZmyq9ZOp3UEwl5V4/Tp4Iw9EB2RcKVcA7456qvI=";
+  }
+]
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyopenssl
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioopenssl";
+  version = "0.6.0";
+
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "horazont";
+    repo = "aioopenssl";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7Q+4/DlP+kUnC3YNk7woJaxLEEiuVmolUOajepM003Q=";
+  };
+
+  propagatedBuildInputs = [
+    pyopenssl
+  ];
+
+  pythonImportsCheck = [ "aioopenssl" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "TLS-capable transport using OpenSSL for asyncio";
+    homepage = "https://github.com/horazont/aioopenssl";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pyopenssl
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aiosasl";
+  version = "0.5.0";
+
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "horazont";
+    repo = "aiosasl";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-JIuNPb/l4QURMQc905H2iNGCfMz+zM/QJhDQOR8LPdc=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "python311-compat.patch";
+      url = "https://github.com/horazont/aiosasl/commit/44c48d36b416bd635d970dba2607a31b2167ea1b.patch";
+      hash = "sha256-u6PJKV54dU2MA9hXa/9hJ3eLVds1DuLHGbt8y/OakWs=";
+    })
+  ];
+
+  nativeCheckInputs = [
+    pyopenssl
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiosasl" ];
+
+  meta = {
+    description = "Asyncio SASL library";
+    homepage = "https://github.com/horazont/aiosasl";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -0,0 +1,68 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiosasl
+, aioopenssl
+, babel
+, dnspython
+, lxml
+, multidict
+, pyasn1
+, pyasn1-modules
+, pyopenssl
+, sortedcollections
+, tzlocal
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioxmpp";
+  version = "0.13.3";
+
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "horazont";
+    repo = "aioxmpp";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo=";
+  };
+
+  propagatedBuildInputs = [
+    aiosasl
+    aioopenssl
+    babel
+    dnspython
+    lxml
+    multidict
+    pyasn1
+    pyasn1-modules
+    pyopenssl
+    sortedcollections
+    tzlocal
+  ];
+
+  pythonImportsCheck = [
+    "aioxmpp"
+    "aioxmpp.node"
+    "aioxmpp.security_layer"
+    "aioxmpp.stanza"
+    "aioxmpp.stream"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    "benchmarks"
+  ];
+
+  meta = {
+    changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst";
+    description = "Pure-python XMPP library for asyncio";
+    homepage = "https://github.com/horazont/aioxmpp";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "bx-py-utils";
-  version = "75";
+  version = "76";

  disabled = pythonOlder "3.9";

@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "boxine";
    repo = "bx_py_utils";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+RHt5QTXxuaY1tDe1M66TrQfT9I7X56oVQAW36mzSwM=";
+    hash = "sha256-daqbF+DCt4yvKHbEzwJyOzEgsYLqhR31a0pYqp9OSvo=";
  };

  nativeBuildInputs = [
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "env-canada";
-  version = "0.5.28";
+  version = "0.5.29";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "michaeldavie";
    repo = "env_canada";
    rev = "refs/tags/v${version}";
-    hash = "sha256-R0iPu4aeltQ7sAhPRu48HmhtB1NezsSRHC44fUKNSEE=";
+    hash = "sha256-iGL2LrjVDj4rmzRe6JEBlZxqk6Zt1JlCsQdo+wYXb+0=";
  };

  propagatedBuildInputs = [
@@ -1,47 +1,83 @@
-{ buildPythonPackage
-, inkscape
+{ lib
+, buildPythonPackage
+, fetchFromGitLab
+, poetry-core
 , cssselect
 , lxml
 , numpy
+, packaging
+, pillow
 , pygobject3
-, python
+, pyserial
+, scour
+, gobject-introspection
+, pytestCheckHook
+, gtk3
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "inkex";
-  inherit (inkscape) version;
+  version = "1.2.2";

-  format = "other";
+  format = "pyproject";
+
+  src = fetchFromGitLab {
+    owner = "inkscape";
+    repo = "extensions";
+    rev = "EXTENSIONS_AT_INKSCAPE_${version}";
+    hash = "sha256-jw7daZQTBxLHWOpjZkMYtP1vIQvd/eLgiktWqVSjEgU=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace '"1.2.0"' '"${version}"' \
+      --replace 'scour = "^0.37"' 'scour = ">=0.37"'
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];

  propagatedBuildInputs = [
    cssselect
    lxml
    numpy
+    packaging
+    pillow
    pygobject3
+    pyserial
+    scour
  ];

-  # We just copy the files.
-  dontUnpack = true;
-  dontBuild = true;
+  pythonImportsCheck = [ "inkex" ];

-  # No tests installed.
-  doCheck = false;
+  nativeCheckInputs = [
+    gobject-introspection
+    pytestCheckHook
+  ];

-  installPhase = ''
-    runHook preInstall
+  checkInputs = [
+    gtk3
+  ];

-    mkdir -p "$out/${python.sitePackages}"
-    cp -r "${inkscape}/share/inkscape/extensions/inkex" "$out/${python.sitePackages}"
+  disabledTests = [
+    "test_extract_multiple"
+    "test_lookup_and"
+  ];

-    runHook postInstall
-  '';
+  disabledTestPaths = [
+    # Fatal Python error: Segmentation fault
+    "tests/test_inkex_gui.py"
+    "tests/test_inkex_gui_listview.py"
+    "tests/test_inkex_gui_window.py"
+    # Failed to find pixmap 'image-missing' in /build/source/tests/data/
+    "tests/test_inkex_gui_pixmaps.py"
+  ];

-  meta = inkscape.meta // {
-    description = "Inkscape Extensions Library";
-    longDescription = ''
-      This module provides support for inkscape extensions, it includes support for opening svg files and processing them.
-
-      Standalone, it is especially useful for running tests for Inkscape extensions.
-    '';
+  meta = {
+    description = "Library for manipulating SVG documents which is the basis for Inkscape extensions";
+    homepage = "https://gitlab.com/inkscape/extensions";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
  };
 }
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "msoffcrypto-tool";
-  version = "5.0.0";
+  version = "5.0.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "nolze";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-A5A578JZrxRXX6ewkFzittGTOebeNb99fuKsEm5QGoI=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OrGgY+CEhAHGOOIPYK8OijRdoh0PRelnsKB++ksUIXY=";
  };

  nativeBuildInputs = [
@@ -49,6 +49,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python tool and library for decrypting MS Office files with passwords or other keys";
    homepage = "https://github.com/nolze/msoffcrypto-tool";
+    changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "notifications-python-client";
-  version = "7.0.0";
+  version = "8.0.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "alphagov";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-eJruM9hjyxz+DOkwB6ARkSHBELcXjtFOop/UCwd+vdE=";
+    hash = "sha256-feATZS7PG9IKY6ooPztA49WykQ/Bt67frSe3PpbiCLc=";
  };

  propagatedBuildInputs = [
@@ -1,11 +1,11 @@
-{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
+{ lib, fetchurl, buildPythonPackage, python, isPyPy, pythonAtLeast, sip-module ? "sip" }:

 buildPythonPackage rec {
  pname = sip-module;
  version = "4.19.25";
  format = "other";

-  disabled = isPyPy;
+  disabled = isPyPy || pythonAtLeast "3.11";

  src = fetchurl {
    url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
@@ -1,24 +1,39 @@
 { lib
 , buildPythonPackage
+, pythonOlder
 , fetchFromGitHub
+, poetry-core
+, inkex
 , lxml
 , pytestCheckHook
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "svg2tikz";
-  version = "unstable-2021-01-12";
+  version = "1.2.0";

-  format = "setuptools";
+  disabled = pythonOlder "3.10";
+
+  format = "pyproject";

  src = fetchFromGitHub {
    owner = "xyz2tex";
    repo = "svg2tikz";
-    rev = "7a9959c295e1ed73e543474c6f3679d04cebc9e9";
-    hash = "sha256-OLMFtEEdcY8ARI+hUSOhMwwcrtOAsbKRJRdDJcuaIBg=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oFcKRcXef1Uz0qFi6Gga/D4u8zW0RjXAnHDlhRr33Ts=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "+dairiki.1" ""
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
  propagatedBuildInputs = [
+    inkex
    lxml
  ];

@@ -26,12 +41,10 @@ buildPythonPackage {
    pytestCheckHook
  ];

-  # upstream hasn't updated the tests in a while
-  doCheck = false;
-
  pythonImportsCheck = [ "svg2tikz" ];

  meta = with lib; {
+    changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/README.md#changes-bug-fixes-and-known-problems-from-the-original";
    homepage = "https://github.com/xyz2tex/svg2tikz";
    description = "Set of tools for converting SVG graphics to TikZ/PGF code";
    license = licenses.gpl2Plus;
@@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec {

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk=";
+    hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk=";
  };

-  cargoSha256 = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0=";
+  cargoHash = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0=";

-  meta = with lib; {
+  meta = {
    description = "Quickly get ANSI escape sequences";
    longDescription = ''
      CLI utility called "ansi" to quickly get ANSI escape sequences. Supports
      the colors and styles, such as bold or italic.
    '';
    homepage = "https://github.com/phip1611/ansi-escape-sequences-cli";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ phip1611 ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ phip1611 ];
    mainProgram = "ansi";
  };
 }
@@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "konstraint";
-  version = "0.25.0";
+  version = "0.25.1";

  src = fetchFromGitHub {
    owner = "plexsystems";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-GDHpITuDdZBphkjQGcnhN7H6yHA9CsyVBkinFsM2RrA=";
+    sha256 = "sha256-KOl1K6XSublOxaCE89QXIRESyBrfgrJnVkaaC76ld1E=";
  };
-  vendorHash = "sha256-Ou73kXEcyxXW6u0dUBvx9alJrloc/CUm1VWKphCUPCg=";
+  vendorHash = "sha256-t306WYXPVXHqp6Ixd02QTVSLJ8VI57FA1KwMDW/JSeg=";

  # Exclude go within .github folder
  excludedPackages = ".github";
@@ -2410,9 +2410,7 @@ lib.composeManyExtensions [

      # Stop infinite recursion by using bootstrapped pkg from nixpkgs
      bootstrapped-pip = super.bootstrapped-pip.override {
-        wheel = (pkgs.python3.pkgs.override {
-          python = self.python;
-        }).wheel;
+        wheel = self.python.pkgs.wheel;
      };

      watchfiles =
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-dist";
-  version = "0.0.2";
+  version = "0.0.3";

  src = fetchFromGitHub {
    owner = "axodotdev";
    repo = "cargo-dist";
    rev = "v${version}";
-    hash = "sha256-7/TUk9LGwmHhKwFtwFQM7C/1ItRsoJ4IodeUPWfGjkc=";
+    hash = "sha256-I++dffdEXDg55WR66+Zl5P2KBvt19sp3aZkXA1GBb4A=";
  };

-  cargoHash = "sha256-vmHPjecd1u0f8wSTu+LE2BNiZlskDADLXNjIj2v7D5E=";
+  cargoHash = "sha256-fLHkW28V5MBQeQDd0VrtEjou5FYwArkNDtS/jXKo8G8=";

  nativeBuildInputs = [
    pkg-config
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
  meta = with lib; {
    description = "A tool for building final distributable artifacts and uploading them to an archive";
    homepage = "https://github.com/axodotdev/cargo-dist";
-    changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/RELEASES.md";
+    changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/CHANGELOG.md";
    license = with licenses; [ asl20 mit ];
    maintainers = with maintainers; [ figsoda ];
  };
@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-llvm-lines";
-  version = "0.4.24";
+  version = "0.4.25";

  src = fetchFromGitHub {
    owner = "dtolnay";
    repo = pname;
    rev = version;
-    sha256 = "sha256-+jCjbx3CytE7wpVmErJjGFZS7E8VB8wjl7BAd9/USuY=";
+    sha256 = "sha256-KTSp4pbxKkSX1Kh7CILtTVq2mjOpn4SKxO16l+I+i7k=";
  };

-  cargoSha256 = "sha256-QC4+hXJiDB0odGm0/m0/JpQv5TyaAg4MmU/0vMJytk4=";
+  cargoSha256 = "sha256-A+vUn/TLpp2dVOA5CAjFlviG+SPTd4BstOb0/NHCpdE=";

  meta = with lib; {
    description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q=";
+    hash = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q=";
  };

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

  # The bin feature activates all dependencies of the binary. Otherwise,
  # only the library is build.
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
    darwin.apple_sdk.frameworks.Security
  ];

-  meta = with lib; {
+  meta = {
    description = "CLI-Tool to measure the TTFB (time to first byte) of HTTP(S) requests";
    longDescription = ''
      This crate measures the times of DNS lookup, TCP connect, TLS handshake, and HTTP's TTFB
@@ -38,8 +38,8 @@ rustPlatform.buildRustPackage rec {
    '';
    homepage = "https://github.com/phip1611/ttfb";
    changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ phip1611 ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ phip1611 ];
  };
 }

@@ -51,11 +51,11 @@ rec {
  # Vulkan developer beta driver
  # See here for more information: https://developer.nvidia.com/vulkan-driver
  vulkan_beta = generic rec {
-    version = "525.47.06";
+    version = "525.47.11";
    persistencedVersion = "525.85.05";
    settingsVersion = "525.85.05";
-    sha256_64bit = "sha256-HxRXtd3ubjS1V/y1hDWe16XNSCbQYHoEw+Jz8Emy5/4=";
-    openSha256 = "sha256-oiOlCdkFMXm4vVZzmnnI5/INVWUqC02gGj/aIfzjGig=";
+    sha256_64bit = "sha256-R3W0Nn9HDluzF316kWDlBnmCgS/O3Atic4poJnjAdPU=";
+    openSha256 = "sha256-tZXzYQBx/3PzmHYrxmUD6iwxqwbi5/uVlN/7DU82oig=";
    settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8=";
    persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI=";
    url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
@@ -49,31 +49,24 @@ in

 stdenv.mkDerivation rec {
  pname = "mir";
-  version = "2.12.0";
+  version = "2.12.1";

  src = fetchFromGitHub {
    owner = "MirServer";
    repo = "mir";
    rev = "v${version}";
-    hash = "sha256-HQmcYnmzeJCsgMoM/y70PCF+3umZh0xJS5S0wFODlmo=";
+    hash = "sha256-c9lFlzoxj45Xx5FYd0O/arVCV9ilArzj5GrPuJigJ4E=";
  };

  patches = [
    # Fixes various path concatenation problems and missing GNUInstallDirs variable uses that affect
    # install locations and generated pkg-config files
-    # Remove when a version > 2.12.0 has the fixes
+    # Remove when a version > 2.12.1 has the fixes
    (fetchpatch {
      name = "0001-mir-Better-install-path-concatenations-and-more-GNUInstallDirs-variables.patch";
      url = "https://github.com/MirServer/mir/commit/58c4ca628748278b1eb7a3721ad9a0c3590e28f2.patch";
      hash = "sha256-+FNVlApaVzA94cy4awulLwTtggD07xACbvjII/RxyRM=";
    })
-    # Fixes doc building
-    # Remove when a version > 2.12.0 has the fix
-    (fetchpatch {
-      name = "0002-mir-better-removal-of-existing-docs.patch";
-      url = "https://github.com/MirServer/mir/commit/04892531c988201f0219ce140f27d7ff60eeebd5.patch";
-      hash = "sha256-LyGgaIoe6mk4IQxBo6Xk5SmIBtTXOXAOA1xAgsdhcLY=";
-    })
  ];

  postPatch = ''
@@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "zed";
-  version = "0.9.1";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "authzed";
    repo = "zed";
    rev = "v${version}";
-    hash = "sha256-bA9ZIYzt6d0PaIChQcS9uUakxmsx/SElHite6boAd3o=";
+    hash = "sha256-kmbZ0fi7rbJUsMREOH+IxHIDfZ2qy+AD8Px9pu4eSxM=";
  };

  vendorHash = "sha256-4Y/98VEZWjk2k4UPtGEumOMbjjR4V1OnPvj5mxuX/DQ=";
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "uxplay";
-  version = "1.63";
+  version = "1.63.2";

  src = fetchFromGitHub {
    owner = "FDH2";
    repo = "UxPlay";
    rev = "v${version}";
-    sha256 = "sha256-ZoeznQhao/inD3fxjhD8L7rLQGAQAEo3gRxw3Zi+Fbs=";
+    sha256 = "sha256-K1DlGpamX+MkVpevhZBINtNawkPfN5ofHOcsiBHgnC4=";
  };

  postPatch = ''
@@ -4,27 +4,43 @@
 , dpkg
 , autoPatchelfHook
 , makeWrapper
+, copyDesktopItems
+, makeDesktopItem
 , dbus
 , nftables
 }:

 stdenv.mkDerivation rec {
  pname = "cloudflare-warp";
-  version = "2022.8.936";
+  version = "2023.1.133";

  src = fetchurl {
-    url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2022_8_936_1_amd64_1923bb9dba.deb";
-    sha256 = "sha256-ZuJyMl6g8KDwxc9UipH63naJ4dl/84Vhk7ini/VNPno=";
+    url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb";
+    sha256 = "sha256-Yo1JnbXi9vbYYAkmwk4S7JZZE45SV4p4dB55Rt+w+LA=";
  };

  nativeBuildInputs = [
    dpkg
    autoPatchelfHook
    makeWrapper
+    copyDesktopItems
  ];

  buildInputs = [ dbus ];

+  desktopItems = [
+    (makeDesktopItem {
+      name = "com.cloudflare.WarpCli";
+      desktopName = "Cloudflare Zero Trust Team Enrollment";
+      categories = [ "Utility" "Security" "ConsoleOnly" ];
+      noDisplay = true;
+      mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ];
+      exec = "warp-cli teams-enroll-token %u";
+      startupNotify = false;
+      terminal = true;
+    })
+  ];
+
  unpackPhase = ''
    dpkg-deb -x ${src} ./
  '';
@@ -2,29 +2,26 @@

 python3Packages.buildPythonApplication rec {
  pname = "moodle-dl";
-  version = "2.1.2.5";
+  version = "2.2.2.4";

  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "1gc4037dwyi48h4vi0bam23rr7pfyn6jrz334radz0r6rk94y8lz";
+    hash = "sha256-76JU/uYJH7nVWCR+d8vvjYCCSMfe/8R9l756AmzZPHU=";
  };

-  # nixpkgs (and the GitHub upstream for readchar) are missing 2.0.1
-  postPatch = ''
-    substituteInPlace setup.py --replace 'readchar>=2.0.1' 'readchar>=2.0.0'
-  '';
-
  propagatedBuildInputs = with python3Packages; [
    sentry-sdk
    colorama
-    readchar
-    youtube-dl
+    yt-dlp
    certifi
    html2text
    requests
-    slixmpp
+    aioxmpp
  ];

+  # upstream has no tests
+  doCheck = false;
+
  meta = with lib; {
    homepage = "https://github.com/C0D3D3V/Moodle-Downloader-2";
    maintainers = [ maintainers.kmein ];
@@ -23,20 +23,20 @@ let
  openvpn3-core = fetchFromGitHub {
    owner = "OpenVPN";
    repo = "openvpn3";
-    rev = "c4fa5a69c5d2e4ba4a86e79da8de0fc95f95edc3";
-    sha256 = "sha256-VhQkx35JKNqXKgg4i+/aJYIg3iXPGlC57wDrjDpvTyE=";
+    rev = "7590cb109349809b948e8edaeecabdbfe24e4b17";
+    hash = "sha256-S9D/FQa7HYj0FJnyb5dCrtgTH9Nf2nvtyp/VHiebq7I=";
  };
 in
 stdenv.mkDerivation rec {
  pname = "openvpn3";
  # also update openvpn3-core
-  version = "18_beta";
+  version = "19_beta";

  src = fetchFromGitHub {
    owner = "OpenVPN";
    repo = "openvpn3-linux";
    rev = "v${version}";
-    sha256 = "sha256-4TKRnHjEm6QRE2artAa0t1VC+0XPgz3VpCfQS8tnrFQ=";
+    hash = "sha256-5dhxJBJMtNvxLZdcvJSOIDdLVBu3i9ak4A+hz5YsIds=";
  };

  postPatch = ''
@@ -5,7 +5,7 @@

 buildGoModule rec {
  pname = "trufflehog";
-  version = "3.28.1";
+  version = "3.28.2";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
@@ -14,11 +14,11 @@

 mkDerivation rec {
  pname = "kdiff3";
-  version = "1.9.6";
+  version = "1.10.0";

  src = fetchurl {
    url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-rJIkdvhQYTpzkoTj+vR3yYrDSa0Vpzeity3thFH2srw=";
+    sha256 = "sha256-s/l+Gz6BF1VKeljVj48PaT/wMKQrvLcwj7RPhZWM1Ss=";
  };

  buildInputs = [ boost ];
@@ -278,6 +278,8 @@ self: super: with self; {

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

+  aioopenssl = callPackage ../development/python-modules/aioopenssl { };
+
  aiopg = callPackage ../development/python-modules/aiopg { };

  aioprocessing = callPackage ../development/python-modules/aioprocessing { };
@@ -318,6 +320,8 @@ self: super: with self; {

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

+  aiosasl = callPackage ../development/python-modules/aiosasl { };
+
  aiosenseme = callPackage ../development/python-modules/aiosenseme { };

  aiosenz = callPackage ../development/python-modules/aiosenz { };
@@ -368,6 +372,8 @@ self: super: with self; {

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

+  aioxmpp = callPackage ../development/python-modules/aioxmpp { };
+
  aioymaps = callPackage ../development/python-modules/aioymaps { };

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