Merge branch 'master' into haskell-updates

2022-09-21 17:42:00 +02:00 · 2022-09-21 17:42:00 +02:00 · 90eacab493
parent bc5a846851 0ba6b83dd3
commit 90eacab493
103 changed files with 2289 additions and 1523 deletions
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@ -18,6 +18,8 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - uses: cachix/install-nix-action@v17
+        with:
+          nix_path: nixpkgs=channel:nixpkgs-unstable
      - name: setup
        id: setup
        run: |
--- a/doc/hooks/postgresql-test-hook.section.md
+++ b/doc/hooks/postgresql-test-hook.section.md
@ -40,7 +40,7 @@ Exported variables:

 Bash-only variables:

- - `postgresqlTestUserOptions`: SQL options to use when creating the `$PGUSER` role, default: `LOGIN`.
+ - `postgresqlTestUserOptions`: SQL options to use when creating the `$PGUSER` role, default: `"LOGIN"`. Example: `"LOGIN SUPERUSER"`
 - `postgresqlTestSetupSQL`: SQL commands to run as database administrator after startup, default: statements that create `$PGUSER` and `$PGDATABASE`.
 - `postgresqlTestSetupCommands`: bash commands to run after database start, defaults to running `$postgresqlTestSetupSQL` as database administrator.
 - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -603,6 +603,12 @@
    githubId = 782180;
    name = "Alex Vorobiev";
  };
+  alexwinter = {
+    email = "git@alexwinter.net";
+    github = "lxwntr";
+    githubId = 50754358;
+    name = "Alex Winter";
+  };
  alexeyre = {
    email = "A.Eyre@sms.ed.ac.uk";
    github = "alexeyre";
@ -15401,4 +15407,10 @@
    github = "zuzuleinen";
    githubId = 944919;
  };
+  quasigod-io = {
+    email = "quasigod-io@protonmail.com";
+    name = "Michael Belsanti";
+    github = "quasigod-io";
+    githubId = 62124625;
+  };
 }
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@ -79,7 +79,6 @@ in {
        "--verbose"
        "--debug"
        "--unsupported-gpu"
-        "--my-next-gpu-wont-be-nvidia"
      ];
      description = lib.mdDoc ''
        Command line arguments passed to launch Sway. Please DO NOT report
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@ -71,9 +71,6 @@ in
  };

  config =
-    let
-      localPostgres = (cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql");
-    in
    lib.mkIf cfg.enable {
      services.lemmy.settings = (mapAttrs (name: mkDefault)
        {
@ -100,8 +97,13 @@ in
        };
      });

-      services.postgresql = mkIf localPostgres {
-        enable = mkDefault true;
+      services.postgresql = mkIf cfg.database.createLocally {
+        enable = true;
+        ensureDatabases = [ cfg.settings.database.database ];
+        ensureUsers = [{
+          name = cfg.settings.database.user;
+          ensurePermissions."DATABASE ${cfg.settings.database.database}" = "ALL PRIVILEGES";
+        }];
      };

      services.pict-rs.enable = true;
@ -141,7 +143,7 @@ in
      };

      assertions = [{
-        assertion = cfg.database.createLocally -> localPostgres;
+        assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
        message = "if you want to create the database locally, you need to use a local database";
      }];

@ -162,9 +164,9 @@ in

        wantedBy = [ "multi-user.target" ];

-        after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
+        after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];

-        requires = lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
+        requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];

        serviceConfig = {
          DynamicUser = true;
@ -201,27 +203,6 @@ in
          ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js";
        };
      };
-
-      systemd.services.lemmy-postgresql = mkIf cfg.database.createLocally {
-        description = "Lemmy postgresql db";
-        after = [ "postgresql.service" ];
-        partOf = [ "lemmy.service" ];
-        script = with cfg.settings.database; ''
-          PSQL() {
-            ${config.services.postgresql.package}/bin/psql --port=${toString cfg.settings.database.port} "$@"
-          }
-          # check if the database already exists
-          if ! PSQL -lqt | ${pkgs.coreutils}/bin/cut -d \| -f 1 | ${pkgs.gnugrep}/bin/grep -qw ${database} ; then
-            PSQL -tAc "CREATE ROLE ${user} WITH LOGIN;"
-            PSQL -tAc "CREATE DATABASE ${database} WITH OWNER ${user};"
-          fi
-        '';
-        serviceConfig = {
-          User = config.services.postgresql.superUser;
-          Type = "oneshot";
-          RemainAfterExit = true;
-        };
-      };
    };

 }
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@ -424,5 +424,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        docker.succeed("docker run --rm etc | grep localhost")
        docker.succeed("docker image rm etc:latest")

+    with subtest("image-with-certs"):
+        docker.succeed("<${examples.image-with-certs} docker load")
+        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/ssl/certs/ca-bundle.crt")
+        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/ssl/certs/ca-certificates.crt")
+        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/pki/tls/certs/ca-bundle.crt")
+        docker.succeed("docker image rm image-with-certs:latest")
+
  '';
 })
--- a/pkgs/applications/blockchains/elements/default.nix
+++ b/pkgs/applications/blockchains/elements/default.nix
@ -5,6 +5,7 @@
 , pkg-config
 , util-linux
 , hexdump
+, autoSignDarwinBinariesHook
 , wrapQtAppsHook ? null
 , boost
 , libevent
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
    [ autoreconfHook pkg-config ]
    ++ optionals stdenv.isLinux [ util-linux ]
    ++ optionals stdenv.isDarwin [ hexdump ]
+    ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
    ++ optionals withGui [ wrapQtAppsHook ];

  buildInputs = [ boost libevent miniupnpc zeromq zlib ]
@ -56,12 +58,16 @@ stdenv.mkDerivation rec {
    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
  ];

+  # fix "Killed: 9  test/test_bitcoin"
+  # https://github.com/NixOS/nixpkgs/issues/179474
+  hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ];
+
  checkInputs = [ python3 ];

  doCheck = true;

  checkFlags =
-    [ "LC_ALL=C.UTF-8" ]
+    [ "LC_ALL=en_US.UTF-8" ]
    # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
    # See also https://github.com/NixOS/nixpkgs/issues/24256
    ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -984,7 +984,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "sha256-QAfHhpXABuOPaHCfQQZYhBERGXMaJPFipWHt/MeSc3c=";
+          cargoSha256 = "sha256-g5yNqDCN1O9x7/HcM8NsZlMwLudDTuPLE5gSpScNQnY=";
        };
      in
      ''
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -726,6 +726,7 @@ https://github.com/mtikekar/vim-bsv/,,
 https://github.com/jeetsukumaran/vim-buffergator/,,
 https://github.com/bling/vim-bufferline/,,
 https://github.com/qpkorr/vim-bufkill/,,
+https://github.com/isobit/vim-caddyfile/,HEAD,
 https://github.com/tpope/vim-capslock/,,
 https://github.com/kristijanhusak/vim-carbon-now-sh/,,
 https://github.com/m-pilia/vim-ccls/,,
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hugo";
-  version = "0.103.0";
+  version = "0.103.1";

  src = fetchFromGitHub {
    owner = "gohugoio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-X78wmxEjw2noOjOj3uujXZHsPOSdZJ4KPz4Ia5sOu3I=";
+    sha256 = "sha256-KSNBbSJROx65WxOd98XLLbbSDL0x4ESEKVIsrZV911k=";
  };

  vendorSha256 = "sha256-Y0+D5H7kWi+bacJm1pouYDPHnnSRPatOt6qPfkk92X4=";
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@ -22,6 +22,7 @@
 , zstd
 , yq-go
 , nixosTests
+, pkgsBuildBuild
 }:

 with lib;
@ -240,7 +241,11 @@ buildGoModule rec {

    substituteInPlace scripts/package-cli \
      --replace '"''${GO}" generate' \
-                'GOFLAGS="" "''${GO}" generate'
+                'GOFLAGS="" \
+                 GOOS="${pkgsBuildBuild.go.GOOS}" \
+                 GOARCH="${pkgsBuildBuild.go.GOARCH}" \
+                 CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \
+                 "''${GO}" generate'
  '';

  # Important utilities used by the kubelet, see
--- a/pkgs/applications/networking/cluster/kubebuilder/default.nix
+++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix
@ -9,15 +9,15 @@

 buildGoModule rec {
  pname = "kubebuilder";
-  version = "3.6.0";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = "kubebuilder";
    rev = "v${version}";
-    sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ=";
+    sha256 = "sha256-nLjmz9OakBLTBWdYA6czgtJmCuP96abNwLcLZo+yZ48=";
  };
-  vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ=";
+  vendorSha256 = "sha256-xljLDwubwr6rZ/ZpW9/WithClaMo88ivlBhWFb0iAvo=";

  subPackages = ["cmd"];

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

 buildGoModule rec {
  pname = "talosctl";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "siderolabs";
    repo = "talos";
    rev = "v${version}";
-    sha256 = "sha256-XWqyeUBrM/ks6Y7tfVXcynuZp9Ied0B7AdtC/qGCBQA=";
+    sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg=";
  };

-  vendorSha256 = "sha256-BEKo67EgbCnX5B12Dkio0vkawAdCn+fA8eXn90EPm00=";
+  vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk=";

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

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -51,10 +51,10 @@
    "owner": "aliyun",
    "provider-source-address": "registry.terraform.io/aliyun/alicloud",
    "repo": "terraform-provider-alicloud",
-    "rev": "v1.184.0",
-    "sha256": "sha256-MR0K1IqfTe1eA7F0URHcJtxRtptuiFOhlCU0ZenG0fI=",
-    "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=",
-    "version": "1.184.0"
+    "rev": "v1.186.0",
+    "sha256": "sha256-ubALJacK0vHndZGarGWus+S2EmRRL0XaX1/ORgBPejs=",
+    "vendorSha256": "sha256-TUcwNiS+WpvoLQWzAqdPDHqnNVrnAI2h6UkC6YsfG/s=",
+    "version": "1.186.0"
  },
  "ansible": {
    "owner": "nbering",
@ -78,10 +78,10 @@
    "owner": "auth0",
    "provider-source-address": "registry.terraform.io/auth0/auth0",
    "repo": "terraform-provider-auth0",
-    "rev": "v0.37.0",
-    "sha256": "sha256-2C5OHkRzYjhOH/snZ3CDWILaxusvG/7GYRtjpGUJljM=",
-    "vendorSha256": "sha256-yV6gO0Hv7zYs+0Lxy4mAMRkHoVDSMG+D5d2ZWH6TqW8=",
-    "version": "0.37.0"
+    "rev": "v0.37.1",
+    "sha256": "sha256-0y7sS03/cvO49jo4IY+xyh3dYZYcHOTlbCV1JBiYZQ4=",
+    "vendorSha256": "sha256-8mGbTkAf42YQ5kKQmC0qSS8lj6Bd/KzpyX3MtS9r6Fk=",
+    "version": "0.37.1"
  },
  "avi": {
    "owner": "vmware",
@ -105,10 +105,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/aws",
    "repo": "terraform-provider-aws",
-    "rev": "v4.30.0",
-    "sha256": "sha256-MEHjn4F2HQLdewtZSPj3ruy7aHbws1gEmcJUGw6rINg=",
-    "vendorSha256": "sha256-tjebt9fxGJv5WHQoMyhIu+pqGskH7zAT0KYOFlaUI/I=",
-    "version": "4.30.0"
+    "rev": "v4.31.0",
+    "sha256": "sha256-v+ye1qynG958XHvAcg954toIjVHIyoa5dcKXUB8zi8E=",
+    "vendorSha256": "sha256-99iNQPVOhuKOGq2VRExm6y6Ab/NzaRmJxwRJfmkYycM=",
+    "version": "4.31.0"
  },
  "azuread": {
    "owner": "hashicorp",
@ -123,10 +123,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/azurerm",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.22.0",
-    "sha256": "sha256-E7rk78HNX5jaaA2bWaHCOcz4PxAICqxUWaHAfAIyO7I=",
+    "rev": "v3.23.0",
+    "sha256": "sha256-gUZTP2oOGAv75pBjLHs3mFBuzEFn7oqnAJw7S3SBWb0=",
    "vendorSha256": null,
-    "version": "3.22.0"
+    "version": "3.23.0"
  },
  "azurestack": {
    "owner": "hashicorp",
@ -142,10 +142,10 @@
    "owner": "baidubce",
    "provider-source-address": "registry.terraform.io/baidubce/baiducloud",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.15.5",
-    "sha256": "sha256-GJdML2jq3g0HQKcORllEu2FZvBAx6A/deN+0LzIUkz4=",
-    "vendorSha256": "sha256-HSn4iNASqA1p9fT/poI3XlkyceafhpiS0cg3mL/TLEI=",
-    "version": "1.15.5"
+    "rev": "v1.15.8",
+    "sha256": "sha256-uKq0mgIhoV5tszbK944DfZRDsqteDtaE0fI+75o79Cc=",
+    "vendorSha256": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=",
+    "version": "1.15.8"
  },
  "bigip": {
    "owner": "F5Networks",
@ -197,11 +197,12 @@
    "deleteVendor": true,
    "owner": "CheckPointSW",
    "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
+    "proxyVendor": true,
    "repo": "terraform-provider-checkpoint",
-    "rev": "v2.0.0",
-    "sha256": "sha256-z/mB20gQmglr0usVrzhqxR3v9vhoRHXNJ57j8fqNREM=",
-    "vendorSha256": "sha256-rb/X9C8eS9QH88FwuvfvDkGdrjZOTiI9nmcYqydOhdc=",
-    "version": "2.0.0"
+    "rev": "v2.1.0",
+    "sha256": "sha256-pErJcwpUGg2cGKWiagjfneUjSDtT+BxLy5JjZvwCUH0=",
+    "vendorSha256": "sha256-6tH/U0qJ83w9qibuF8/TcRAsCke/VnRVRGfHaWsW9+4=",
+    "version": "2.1.0"
  },
  "ciscoasa": {
    "owner": "CiscoDevNet",
@ -216,19 +217,19 @@
    "owner": "cloudamqp",
    "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp",
    "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.19.1",
-    "sha256": "sha256-oq7wsraZTKSo2tEaUrQ+uzCEuC3LLP6AVLzmCDWBK3A=",
-    "vendorSha256": "sha256-OnkSfHEbbcnSs+pI5wphObRyIXGtNlpeTe/RqxF/pr4=",
-    "version": "1.19.1"
+    "rev": "v1.19.2",
+    "sha256": "sha256-z0tCNZTc7Lc8zw3ueRz3JR+rTNQifEH8RW7zgKe5xhs=",
+    "vendorSha256": "sha256-228hxOsa4CmJcp/AJYR5SACbcCfuO0y4Z9VzqzZ5iJQ=",
+    "version": "1.19.2"
  },
  "cloudflare": {
    "owner": "cloudflare",
    "provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
    "repo": "terraform-provider-cloudflare",
-    "rev": "v3.23.0",
-    "sha256": "sha256-x1DkYesbiJ362XD1gw8QmXS+hNgWO1J6qQNRT7E4aps=",
-    "vendorSha256": "sha256-QrBOxWB+Zs+2kMMv3G4qkUTnZbisDBadPbq1CTFr7Ns=",
-    "version": "3.23.0"
+    "rev": "v3.24.0",
+    "sha256": "sha256-J7hKWt7aHhT9lNbbz73YljcpdfDTcwNsbNE60CHflw0=",
+    "vendorSha256": "sha256-s7VdZAQdXLGiA3q2+X4sQPIrI9f55sdd7HxbLQ8SdBk=",
+    "version": "3.24.0"
  },
  "cloudfoundry": {
    "owner": "cloudfoundry-community",
@ -307,10 +308,10 @@
    "owner": "digitalocean",
    "provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
    "repo": "terraform-provider-digitalocean",
-    "rev": "v2.22.2",
-    "sha256": "sha256-aIfx/dtVgNoLCFz8rXJBQTsmZ6SPA1hm6uMbeQmWkKM=",
+    "rev": "v2.22.3",
+    "sha256": "sha256-FnVmkHNMuWF01eSOCMyPQescyao/cyUjXwimwYU5gqY=",
    "vendorSha256": null,
-    "version": "2.22.2"
+    "version": "2.22.3"
  },
  "dme": {
    "owner": "DNSMadeEasy",
@ -334,19 +335,19 @@
    "owner": "dnsimple",
    "provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
    "repo": "terraform-provider-dnsimple",
-    "rev": "v0.13.0",
-    "sha256": "sha256-Wt/2L4NHaQv5tV2JIjcRMH/mLyfbIk88PFYYmeVNlSQ=",
-    "vendorSha256": "sha256-emwD+bOkkZhh1BOQlW0dfdeD4Y68cULhC+3S7Xrjas4=",
-    "version": "0.13.0"
+    "rev": "v0.14.0",
+    "sha256": "sha256-O64xOyGXLcCFy8rBR9QDzcYDi2fm2AHIObDyOJ33ZmA=",
+    "vendorSha256": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=",
+    "version": "0.14.0"
  },
  "docker": {
    "owner": "kreuzwerker",
    "provider-source-address": "registry.terraform.io/kreuzwerker/docker",
    "repo": "terraform-provider-docker",
-    "rev": "v2.21.0",
-    "sha256": "sha256-btomRNWLTRf+p4H20b56l2/frYXW/j3p+m49JRISQOI=",
+    "rev": "v2.22.0",
+    "sha256": "sha256-hUKe9VjaNbiPhbxyFKly5PlKWngU2pl6ygwRJSokxr8=",
    "vendorSha256": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=",
-    "version": "2.21.0"
+    "version": "2.22.0"
  },
  "elasticsearch": {
    "owner": "phillbaker",
@ -370,10 +371,10 @@
    "owner": "exoscale",
    "provider-source-address": "registry.terraform.io/exoscale/exoscale",
    "repo": "terraform-provider-exoscale",
-    "rev": "v0.40.1",
-    "sha256": "sha256-K5Rj3DoT4TAXF6MGOXgLw30qZmHyUYSMf1Cn4TTmxQk=",
+    "rev": "v0.40.2",
+    "sha256": "sha256-yjpO36B5r4//2ytPe4pwvQ5A8r4hF3nL6M7/SRI0Ml8=",
    "vendorSha256": null,
-    "version": "0.40.1"
+    "version": "0.40.2"
  },
  "external": {
    "owner": "hashicorp",
@ -388,10 +389,10 @@
    "owner": "fastly",
    "provider-source-address": "registry.terraform.io/fastly/fastly",
    "repo": "terraform-provider-fastly",
-    "rev": "v2.3.0",
-    "sha256": "sha256-rnB3GNh5t46ddonej1ofsbmUT3VAkMA8bbFJHhW9HcA=",
+    "rev": "v2.3.2",
+    "sha256": "sha256-Ej7E/xbB8V6Pge/sAkgtQXJac1nuQ3liQDM531zOnu8=",
    "vendorSha256": null,
-    "version": "2.3.0"
+    "version": "2.3.2"
  },
  "flexibleengine": {
    "owner": "FlexibleEngineCloud",
@ -426,10 +427,10 @@
    "owner": "integrations",
    "provider-source-address": "registry.terraform.io/integrations/github",
    "repo": "terraform-provider-github",
-    "rev": "v4.31.0",
-    "sha256": "sha256-BKLY+ROxB35EQ37hlYGaNDdsAEggpGuRP7Uxoo7wFRc=",
+    "rev": "v5.2.0",
+    "sha256": "sha256-wslz9Nf4f1g9dkZYXhE6Xvg/rNOgGKuv/gh1SfP4/co=",
    "vendorSha256": null,
-    "version": "4.31.0"
+    "version": "5.2.0"
  },
  "gitlab": {
    "owner": "gitlabhq",
@ -445,20 +446,20 @@
    "provider-source-address": "registry.terraform.io/hashicorp/google",
    "proxyVendor": true,
    "repo": "terraform-provider-google",
-    "rev": "v4.35.0",
-    "sha256": "sha256-4pp63xRIwJeX9NYTqcUejQoieqMFd4MzhktuOAs1fGo=",
-    "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
-    "version": "4.35.0"
+    "rev": "v4.37.0",
+    "sha256": "sha256-BNLgY5mvtBu2Zfa5Caw5EMzMyZXsmjl6V5LOqrXgz78=",
+    "vendorSha256": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
+    "version": "4.37.0"
  },
  "google-beta": {
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
    "proxyVendor": true,
    "repo": "terraform-provider-google-beta",
-    "rev": "v4.35.0",
-    "sha256": "sha256-e9290ZIfHqh5WelOLm1AYngbzLE3Ur0nwkZu0y0Qo7s=",
-    "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
-    "version": "4.35.0"
+    "rev": "v4.37.0",
+    "sha256": "sha256-hqcpJELpYz9rkjndzhMRveGZKWH/1Pjea9lw7NfTC6c=",
+    "vendorSha256": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
+    "version": "4.37.0"
  },
  "googleworkspace": {
    "owner": "hashicorp",
@ -473,10 +474,10 @@
    "owner": "grafana",
    "provider-source-address": "registry.terraform.io/grafana/grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v1.28.1",
-    "sha256": "sha256-VBwqjkiEFDgxYOCpmRXvJwHh2NOZMsPcYeIpsZbMXs8=",
-    "vendorSha256": "sha256-8iiJgAAKMeh/UBxthl9ebLCIcu/GCZZIfmDcerJakew=",
-    "version": "1.28.1"
+    "rev": "v1.28.2",
+    "sha256": "sha256-iUo7fhUDklFy6pSoZUe2ymEbRbf69dxirASFwSBmJvc=",
+    "vendorSha256": "sha256-YEkJgNtF7I1ofNjRBaIa6u/KFQZcxpR0+uBf+5D5FiM=",
+    "version": "1.28.2"
  },
  "gridscale": {
    "owner": "gridscale",
@ -491,10 +492,10 @@
    "owner": "hetznercloud",
    "provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.35.1",
-    "sha256": "sha256-7zEvBB4FwI5jx+q4tBwPcwxb5CMVpJAnr5NNYZe2BkA=",
-    "vendorSha256": "sha256-5JfUt5+qZqT1NFLLl0sI26bafbAuqrj99Jiuh+kkH8Y=",
-    "version": "1.35.1"
+    "rev": "v1.35.2",
+    "sha256": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
+    "vendorSha256": "sha256-LKngOmB3jfC/wFX398LETSZ8HllfOQA/kGg4uUNlN5A=",
+    "version": "1.35.2"
  },
  "helm": {
    "owner": "hashicorp",
@ -509,10 +510,10 @@
    "owner": "heroku",
    "provider-source-address": "registry.terraform.io/heroku/heroku",
    "repo": "terraform-provider-heroku",
-    "rev": "v5.1.3",
-    "sha256": "sha256-G0qQboL3GYmYkJg5yqEFJly9Z5PzVLiwz9Z9vG2QPDE=",
+    "rev": "v5.1.4",
+    "sha256": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=",
    "vendorSha256": null,
-    "version": "5.1.3"
+    "version": "5.1.4"
  },
  "hetznerdns": {
    "owner": "timohirt",
@ -526,11 +527,12 @@
  "htpasswd": {
    "owner": "loafoe",
    "provider-source-address": "registry.terraform.io/loafoe/htpasswd",
+    "proxyVendor": true,
    "repo": "terraform-provider-htpasswd",
-    "rev": "v1.0.3",
-    "sha256": "sha256-rh1AuD2azYj9bCFPFI9z/1cx6K/pHAEixUG1JXoyPEw=",
-    "vendorSha256": "sha256-FBWwgULCuNilfrGNMETJk7SSOIRFYGpD2L9ExeyFWqE=",
-    "version": "1.0.3"
+    "rev": "v1.0.4",
+    "sha256": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=",
+    "vendorSha256": "sha256-VlJO11t7uqAl0U26T/UY2u//+Vfq97+h4gABWt7iQwk=",
+    "version": "1.0.4"
  },
  "http": {
    "owner": "hashicorp",
@ -545,10 +547,10 @@
    "owner": "huaweicloud",
    "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
    "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.40.1",
-    "sha256": "sha256-ejzyyliMyOjwQAQCx07ysEO0FMlE9jZDcuS2Bcz8Dvs=",
+    "rev": "v1.40.2",
+    "sha256": "sha256-idfHSXXicEeQqjoJGkRDr78Bq00bHz2OtqLlVqehZz8=",
    "vendorSha256": null,
-    "version": "1.40.1"
+    "version": "1.40.2"
  },
  "huaweicloudstack": {
    "owner": "huaweicloud",
@ -626,10 +628,10 @@
    "owner": "kingsoftcloud",
    "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
    "repo": "terraform-provider-ksyun",
-    "rev": "v1.3.49",
-    "sha256": "sha256-cdEnY/pOYMUB6avsoZA/1TyEMOkKVGMSrfNOg6WtF0s=",
+    "rev": "v1.3.52",
+    "sha256": "sha256-3iK17ZiYrQOnfZwFIL/4FF+My5vieszlm2V8reTDEWM=",
    "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=",
-    "version": "1.3.49"
+    "version": "1.3.52"
  },
  "kubectl": {
    "owner": "gavinbunney",
@ -753,10 +755,10 @@
    "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
    "proxyVendor": true,
    "repo": "terraform-provider-mongodbatlas",
-    "rev": "v1.4.5",
-    "sha256": "sha256-uDpbsHJY6BXd1N/maHWfEpZy4tl81P0oI4F2rcJxvH8=",
-    "vendorSha256": "sha256-2ChyCuFJQASobUZBOlbsw7nI4APYE+mdcfIvkr2EEN0=",
-    "version": "1.4.5"
+    "rev": "v1.4.6",
+    "sha256": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
+    "vendorSha256": "sha256-jmT5SoJA4iQDmP9cRedQ4wTPoOXB4NL8hHClsp37ykU=",
+    "version": "1.4.6"
  },
  "namecheap": {
    "owner": "namecheap",
@ -780,10 +782,10 @@
    "owner": "newrelic",
    "provider-source-address": "registry.terraform.io/newrelic/newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.2.0",
-    "sha256": "sha256-t0bns7xtuOc1tankR3izyk97lrz3h87o1m0/CkSF49M=",
-    "vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=",
-    "version": "3.2.0"
+    "rev": "v3.2.1",
+    "sha256": "sha256-qTXnS7ZBHD33W0gcCNnq/Zg99l58Hb+dDl2Ck5wKl8Q=",
+    "vendorSha256": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=",
+    "version": "3.2.1"
  },
  "nomad": {
    "owner": "hashicorp",
@ -798,10 +800,10 @@
    "owner": "ns1-terraform",
    "provider-source-address": "registry.terraform.io/ns1-terraform/ns1",
    "repo": "terraform-provider-ns1",
-    "rev": "v1.12.7",
-    "sha256": "sha256-pzFfU/fs+c0AjY63CmKeKEKrnf+PF1cfG5P4euFY4ns=",
+    "rev": "v1.12.8",
+    "sha256": "sha256-vw3n1EBKwOThoJ+2hFa4rsMzvWCOnhoYOmJpX8LQKy8=",
    "vendorSha256": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=",
-    "version": "1.12.7"
+    "version": "1.12.8"
  },
  "nsxt": {
    "owner": "vmware",
@ -835,19 +837,19 @@
    "owner": "oracle",
    "provider-source-address": "registry.terraform.io/oracle/oci",
    "repo": "terraform-provider-oci",
-    "rev": "v4.92.0",
-    "sha256": "sha256-uLoIGqVJD6CgQlixUgvhAYf7uUtwNDY6Xd3xqdvyYV4=",
+    "rev": "v4.93.0",
+    "sha256": "sha256-xFDdEGa170VPxDOteLnerF+QGHbQP+3+RL4qEPWkUHo=",
    "vendorSha256": null,
-    "version": "4.92.0"
+    "version": "4.93.0"
  },
  "okta": {
    "owner": "okta",
    "provider-source-address": "registry.terraform.io/okta/okta",
    "repo": "terraform-provider-okta",
-    "rev": "v3.35.0",
-    "sha256": "sha256-4L7BbEWyDhi+QYVGhoTvV4sC6zNpQwEKN5GyPo6eMl4=",
-    "vendorSha256": "sha256-YgDzQ8601ODl7BWMkMJTcUcaidcKFpfREUzMYGvwn1Y=",
-    "version": "3.35.0"
+    "rev": "v3.36.0",
+    "sha256": "sha256-rgDBZsbXBzBcDgVoaFkPD27Ezef9J23oqtBJAHqJrrE=",
+    "vendorSha256": "sha256-hjX5kVOM8idWK4F5ahuh6BgK/h5QdkJOn4dizneOkB4=",
+    "version": "3.36.0"
  },
  "oktaasa": {
    "owner": "oktadeveloper",
@ -862,10 +864,10 @@
    "owner": "OpenNebula",
    "provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
    "repo": "terraform-provider-opennebula",
-    "rev": "v0.5.2",
-    "sha256": "sha256-BeaJUEnksjyA8CBAfxz6WjPYo7x8kx/sgFAsgSvdBBM=",
+    "rev": "v1.0.0",
+    "sha256": "sha256-ChqOX6pEvFMUyDAKA6VnD1L9UD2vplVH7dgpMTeiUeA=",
    "vendorSha256": "sha256-iT3c0CBSP+FKM4CFsTopY4W41ZCaC8E3Iz1o+THI/fQ=",
-    "version": "0.5.2"
+    "version": "1.0.0"
  },
  "openstack": {
    "owner": "terraform-provider-openstack",
@ -880,10 +882,10 @@
    "owner": "opentelekomcloud",
    "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.31.2",
-    "sha256": "sha256-wACJpaCQ/FeKFUVvzZGxe5BGogGSZFBI5CGWN456CdY=",
-    "vendorSha256": "sha256-loqQELA5zeLs2860ui4klSkxPzquIQbybQ+MHEUAWAY=",
-    "version": "1.31.2"
+    "rev": "v1.31.3",
+    "sha256": "sha256-gjHRzDyxD9DA0k9H1gfEkFZ3nTzxXUkrCmAJ0CXLEwc=",
+    "vendorSha256": "sha256-MGtxmZwo+Av6c7KPUzjSLoizVXbS3TltGxjoCUbeEb0=",
+    "version": "1.31.3"
  },
  "opsgenie": {
    "owner": "opsgenie",
@ -898,10 +900,10 @@
    "owner": "ovh",
    "provider-source-address": "registry.terraform.io/ovh/ovh",
    "repo": "terraform-provider-ovh",
-    "rev": "v0.20.0",
-    "sha256": "sha256-58eicQZElv0TVH2rPev/JLSIOkDkjjL3cDaTqV2SsOA=",
+    "rev": "v0.21.0",
+    "sha256": "sha256-DHk1AUxHuXLrPiRhfAtJDDNT4TYH1XsUzBqjKGvPK7c=",
    "vendorSha256": null,
-    "version": "0.20.0"
+    "version": "0.21.0"
  },
  "pagerduty": {
    "owner": "PagerDuty",
@ -1042,10 +1044,10 @@
    "owner": "splunk-terraform",
    "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
    "repo": "terraform-provider-signalfx",
-    "rev": "v6.16.0",
-    "sha256": "sha256-Q9H1tefQAkbE9lqRzdkziQ5tAbNZ3k5AylD2G9zidU8=",
+    "rev": "v6.17.0",
+    "sha256": "sha256-ke/35QtsYNW+6HVjBrx6hQ+CO2zhZsVLlryWTgI1vRE=",
    "vendorSha256": "sha256-hxYQF1sZOS5x6sZtUJg13A6SPZG6Ql20vAs8VDQegqQ=",
-    "version": "6.16.0"
+    "version": "6.17.0"
  },
  "skytap": {
    "owner": "skytap",
@ -1060,10 +1062,10 @@
    "owner": "Snowflake-Labs",
    "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
    "repo": "terraform-provider-snowflake",
-    "rev": "v0.43.0",
-    "sha256": "sha256-OTJRcFdudwO15GmciAtlz6/Z7JqOpfjbaANJXvP6Jxw=",
+    "rev": "v0.44.0",
+    "sha256": "sha256-RmCmiQKVNAQexYKFp9shbfPbWUFlJSTCOFUcgADyJg4=",
    "vendorSha256": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=",
-    "version": "0.43.0"
+    "version": "0.44.0"
  },
  "sops": {
    "owner": "carlpett",
@ -1078,10 +1080,10 @@
    "owner": "spotinst",
    "provider-source-address": "registry.terraform.io/spotinst/spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.82.0",
-    "sha256": "sha256-yCqNGpljTrlfDnKAk0A+rgSWZJGHT4tWl4UY99wzJ98=",
-    "vendorSha256": "sha256-VmN61ID/tbPtlBhc9lphSKAHZgADyc57ZyTlWsM9ZLA=",
-    "version": "1.82.0"
+    "rev": "v1.84.0",
+    "sha256": "sha256-D/HFeozi5IRj7G+pRzY/V98+oejfmQlW4y6ddob7OBI=",
+    "vendorSha256": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=",
+    "version": "1.84.0"
  },
  "stackpath": {
    "owner": "stackpath",
@ -1105,19 +1107,19 @@
    "owner": "SumoLogic",
    "provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v2.18.2",
-    "sha256": "sha256-d0g0iSPyQrMlll7DW09+9krTi7lkeszxE786vKtr6aQ=",
+    "rev": "v2.19.0",
+    "sha256": "sha256-1wV+9RHgrqL6LvRE21KM1wBSpyOcoOt07tZcx2s5pGM=",
    "vendorSha256": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=",
-    "version": "2.18.2"
+    "version": "2.19.0"
  },
  "tencentcloud": {
    "owner": "tencentcloudstack",
    "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.77.8",
-    "sha256": "sha256-F3Lk7u/ecCduc7M1+pirJZcnHxmxulDLEZBdNUKPpbI=",
+    "rev": "v1.77.11",
+    "sha256": "sha256-Sn58Xyj0UoVX7YfuLyuUVGrPEWYOH0O5YoTk8vYQQVA=",
    "vendorSha256": null,
-    "version": "1.77.8"
+    "version": "1.77.11"
  },
  "tfe": {
    "owner": "hashicorp",
@ -1150,10 +1152,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/tls",
    "repo": "terraform-provider-tls",
-    "rev": "v4.0.2",
-    "sha256": "sha256-PerRBYTEY6ITLZ5cWifEQ+FAUvsqC6wUzslI/fa96Hc=",
-    "vendorSha256": "sha256-7io1fQRX8+QABY0VRKex6W7fP5kDbij0qXrhzPbr/CY=",
-    "version": "4.0.2"
+    "rev": "v4.0.3",
+    "sha256": "sha256-q3zt+5zd/bJ42sWbFwuE+rDyHHcZoVBZF4c61aJJkMs=",
+    "vendorSha256": "sha256-tW4e+QETPSykMEosahs68VeagToqWWe4ZUQN49gpHHM=",
+    "version": "4.0.3"
  },
  "triton": {
    "deleteVendor": true,
@ -1178,19 +1180,19 @@
    "owner": "ucloud",
    "provider-source-address": "registry.terraform.io/ucloud/ucloud",
    "repo": "terraform-provider-ucloud",
-    "rev": "v1.31.3",
-    "sha256": "sha256-qVBvslXU5pPGMXwaBJ5f0iw4jNLgnnJ4Avr+mhC103Q=",
+    "rev": "v1.32.2",
+    "sha256": "sha256-lx3LLBmqUjRc+Jn+SbLk6DChJJ2jbuh720wnO05qot0=",
    "vendorSha256": null,
-    "version": "1.31.3"
+    "version": "1.32.2"
  },
  "utils": {
    "owner": "cloudposse",
    "provider-source-address": "registry.terraform.io/cloudposse/utils",
    "repo": "terraform-provider-utils",
-    "rev": "1.0.0",
-    "sha256": "sha256-52uoe7OLPVUdJ4eg6ulQ3bSOCIjUgjF22HvRpN1RHFQ=",
-    "vendorSha256": "sha256-cwpVqzONyKwJ5nzkYoqTTtr0rGMWbvL5nJ3d+bbni34=",
-    "version": "1.0.0"
+    "rev": "1.1.0",
+    "sha256": "sha256-KgQnccuNEppJsSF+mddkss1uFCsfx2egdNffQ8a/6Pg=",
+    "vendorSha256": "sha256-tiujJ9jqTHQtxyYo8HKEKETpcRmfXR6cObBKmB8YzfE=",
+    "version": "1.1.0"
  },
  "vault": {
    "owner": "hashicorp",
@ -1277,9 +1279,9 @@
    "owner": "yandex-cloud",
    "provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
    "repo": "terraform-provider-yandex",
-    "rev": "v0.78.2",
-    "sha256": "sha256-jFeJMtwxytmNvCc4NoOlHXs28eQKYV727N4uWGozEmM=",
+    "rev": "v0.79.0",
+    "sha256": "sha256-fnN1Gghgwbbxz8WWr/RJi59+SI+0th4NdB59l+3aVVY=",
    "vendorSha256": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=",
-    "version": "0.78.2"
+    "version": "0.79.0"
  }
 }
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "wee-slack";
-  version = "2.8.0";
+  version = "2.9.0";

  src = fetchFromGitHub {
    repo = "wee-slack";
    owner = "wee-slack";
    rev = "v${version}";
-    sha256 = "0xfklr0gsc9jgxfyrrb2j756lclz9g8imcb0pk0xgyj8mhsw23zk";
+    sha256 = "sha256-WMZo+X8G/Dnl1Vv0LuBYcvxdfll9cy/3Z/fpNJSxCQY=";
  };

  patches = [
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -4,13 +4,13 @@ rec {
  thunderbird = thunderbird-102;
  thunderbird-91 = (buildMozillaMach rec {
    pname = "thunderbird";
-    version = "91.13.0";
+    version = "91.13.1";
    application = "comm/mail";
    applicationName = "Mozilla Thunderbird";
    binaryName = pname;
    src = fetchurl {
      url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-      sha512 = "e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a2bfef14fc20c065055ff6bbd3ca618b5aab178241b53509543640dcd541a";
+      sha512 = "ca1bf821e6ca010c554fc111157af60e627ace7a0d43785ba39b260cd0606480dd5736c188c49ef6c3f1bda4b4c6870767b75e483241e7fd5a4290d689017e73";
    };
    extraPatches = [
      # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
@ -39,13 +39,13 @@ rec {
  };
  thunderbird-102 = (buildMozillaMach rec {
    pname = "thunderbird";
-    version = "102.2.2";
+    version = "102.3.0";
    application = "comm/mail";
    applicationName = "Mozilla Thunderbird";
    binaryName = pname;
    src = fetchurl {
      url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-      sha512 = "fe72ddb81d35d4a85b25a6d955a0b0f705aeda2dca0f572efca7ce94041c4ddcead6c690bda8d4bded4c43e12a15669f9608db6debec38d8b5157a914e280db5";
+      sha512 = "9b9908d9f7b1281df5b2c74a25211973e25d9b780f05b9550c89e5aeb8b39070c517a1a33d0d84a33ed26dbcef99058308b76c056bd4e34987c32f0600e3882e";
    };
    extraPatches = [
      # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
--- a/pkgs/applications/office/micropad/default.nix
+++ b/pkgs/applications/office/micropad/default.nix
@ -14,18 +14,18 @@ let
 in
  mkYarnPackage rec {
    pname = "micropad";
-    version = "3.30.6";
+    version = "4.0.0";

    src = fetchFromGitHub {
      owner = "MicroPad";
      repo = "Micropad-Electron";
      rev = "v${version}";
-      sha256 = "sha256-v3hnHG6FMW2xBU/DnenqjFizQv/OZ9cW99n/3SoENe8=";
+      sha256 = "sha256-slutuLH95wQaZK02vRU/WDbYgG0RZbNKvrihLVMZWpQ=";
    };

    micropad-core = fetchzip {
      url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
-      hash = "sha256-aqshYbVrQg6tYtTlO91FGiH7DuueOA0OU5KGCVc7XvI=";
+      sha256 = "1w0ajx15rm2mmyy4518ai8xfkfd6dfm38i3vfr9q9bw9h6igfn6g";
    };

    packageJSON = ./package.json;
@ -84,6 +84,8 @@ in
      })
    ];

+    passthru.updateScript = ./update.sh;
+
    meta = with lib; {
      description = "A powerful note-taking app that helps you organise + take notes without restrictions";
      homepage = "https://getmicropad.com/";
--- a/pkgs/applications/office/micropad/package.json
+++ b/pkgs/applications/office/micropad/package.json
@ -1,14 +1,15 @@
 {
  "name": "micropad",
-  "version": "3.30.5",
+  "version": "4.0.0",
  "description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
  "main": "main.js",
  "scripts": {
    "start": "yarn build && yarn electron . --is-dev --no-sandbox",
    "build": "yarn tsc -p tsconfig.json",
-    "update-core": "rm -rf core && rm -rf tmp && mkdir tmp && wget https://github.com/MicroPad/MicroPad-Core/releases/download/v${npm_package_version}/micropad.tar.xz -P ./tmp && cd tmp && tar -xf micropad.tar.xz && rm build/*.map && rm build/static/*/*.map && cp -r build ../core && cd .. && rm -rf tmp",
+    "update-core": "rm -rf core && rm -rf tmp && mkdir tmp && wget https://github.com/MicroPad/MicroPad-Core/releases/download/v${npm_package_version}/micropad.tar.xz -P ./tmp && cd tmp && tar -xf micropad.tar.xz && rm build/dist/*.map && cp -r build ../core && cd .. && rm -rf tmp",
    "pack": "yarn build && yarn electron-builder --dir",
-    "dist": "yarn build && yarn electron-builder"
+    "dist": "yarn build && yarn electron-builder",
+    "windows:version": "echo %npm_package_version%"
  },
  "repository": {
    "type": "git",
@ -24,14 +25,16 @@
  },
  "homepage": "https://getmicropad.com",
  "devDependencies": {
-    "electron": "^17.1.0",
-    "electron-builder": "^23.0.2",
-    "typescript": "~4.5.4"
+    "@types/node": "^18.7.18",
+    "electron": "^20.1.4",
+    "electron-builder": "^23.3.3",
+    "typescript": "~4.8.3"
  },
  "dependencies": {
    "dictionary-en": "^3.0.0",
    "dictionary-en-au": "^2.1.1",
    "electron-context-menu": "^3.1.2",
+    "electron-window-state": "^5.0.3",
    "localforage": "^1.10.0",
    "typo-js": "^1.2.1"
  },
@ -47,8 +50,22 @@
    ],
    "linux": {
      "target": [
-        "tar.gz",
-        "AppImage",
+        {
+          "target": "tar.gz",
+          "arch": [
+            "x64",
+            "armv7l",
+            "arm64"
+          ]
+        },
+        {
+          "target": "AppImage",
+          "arch": [
+            "x64",
+            "armv7l",
+            "arm64"
+          ]
+        },
        "snap",
        "deb",
        "rpm",
@ -79,9 +96,19 @@
    },
    "win": {
      "target": [
-        "nsis",
+        {
+          "target": "nsis",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        },
        "portable"
      ]
+    },
+    "nsis": {
+      "allowToChangeInstallationDirectory": true,
+      "oneClick": false
    }
  }
 }
--- a/pkgs/applications/office/micropad/update.sh
+++ b/pkgs/applications/office/micropad/update.sh
@ -0,0 +1,27 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier yarn2nix
+
+set -eu -o pipefail
+
+latest_version=$(curl -s https://api.github.com/repos/MicroPad/Micropad-Electron/releases/latest | jq --raw-output '.tag_name[1:]')
+old_core_hash=$(nix-instantiate --eval --strict -A "micropad.micropad-core.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
+
+{
+    read new_core_hash
+    read store_path
+} < <(
+    nix-prefetch-url --unpack --print-path "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz"
+)
+
+nixFile=$(nix-instantiate --eval --strict -A "micropad.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+nixFolder=$(dirname "$nixFile")
+
+sed -i "$nixFile" -re "s|\"$old_core_hash\"|\"$new_core_hash\"|"
+
+curl -o "$nixFolder/package.json" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/package.json"
+curl -o "$nixFolder/yarn.lock" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/yarn.lock"
+
+prettier --write "$nixFolder/package.json"
+yarn2nix --lockfile "$nixFolder/yarn.lock" >"$nixFolder/yarn.nix"
+
+update-source-version micropad "$latest_version"
--- a/pkgs/applications/office/micropad/yarn.lock
+++ b/pkgs/applications/office/micropad/yarn.lock
--- a/pkgs/applications/office/micropad/yarn.nix
+++ b/pkgs/applications/office/micropad/yarn.nix
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@ -1,12 +1,18 @@
 { airspy
+, airspyhf
+, aptdec
 , boost
 , cm256cc
 , cmake
 , codec2
+, dab_lib
+, dsdcc
+, faad2
 , fetchFromGitHub
 , fftwFloat
 , glew
 , hackrf
+, hidapi
 , lib
 , ffmpeg
 , libiio
@ -15,6 +21,7 @@
 , libusb1
 , limesuite
 , libbladeRF
+, mbelib
 , mkDerivation
 , ocl-icd
 , opencv3
@ -25,21 +32,23 @@
 , qtserialport
 , qtspeech
 , qtwebsockets
+, qtwebengine
 , rtl-sdr
 , serialdv
+, sgp4
 , soapysdr-with-plugins
 , uhd
 }:

 mkDerivation rec {
  pname = "sdrangel";
-  version = "6.18.1";
+  version = "7.6.3";

  src = fetchFromGitHub {
    owner = "f4exb";
    repo = "sdrangel";
    rev = "v${version}";
-    sha256 = "sha256-gf+RUOcki0pi3UH4NHFsmbTV04HUG16UC4jcUjyeip4=";
+    sha256 = "sha256-4o91vZnW5+wAKw4o3RrsS4gGVG0TyQCBcKg4GuE3n5s=";
    fetchSubmodules = false;
  };

@ -47,19 +56,26 @@ mkDerivation rec {

  buildInputs = [
    airspy
+    airspyhf
+    aptdec
    boost
    cm256cc
    codec2
+    dab_lib
+    dsdcc
+    faad2
    ffmpeg
    fftwFloat
    glew
    hackrf
+    hidapi
    libbladeRF
    libiio
    libopus
    libpulseaudio
    libusb1
    limesuite
+    mbelib
    opencv3
    qtcharts
    qtlocation
@ -67,16 +83,21 @@ mkDerivation rec {
    qtserialport
    qtspeech
    qtwebsockets
+    qtwebengine
    rtl-sdr
    serialdv
+    sgp4
    soapysdr-with-plugins
    uhd
  ];

  cmakeFlags = [
+    "-DAPT_DIR=${aptdec}"
+    "-DDAB_LIB=${dab_lib}"
    "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
    "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
    "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"
+    "-DSGP4_DIR=${sgp4}"
    "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
  ];

--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";

 stdenv.mkDerivation rec {
  pname = "avidemux";
-  version = "2.8.0";
+  version = "2.8.1";

  src = fetchurl {
    url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "sha256-0exvUnflEijs8O4cqJ+uJMWR9SD4fOlvq+yIGNBN4zs=";
+    sha256 = "sha256-d9m9yoaDzlfBkradIHz6t8+Sp3Wc4PY/o3tcjkKtPaI=";
  };

  patches = [
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@ -0,0 +1,80 @@
+{ autoPatchelfHook
+, fetchurl
+, gcc-unwrapped
+, gsettings-desktop-schemas
+, gtk3
+, lib
+, makeDesktopItem
+, makeWrapper
+, nwjs
+, stdenv
+, unzip
+, udev
+, wrapGAppsHook
+, copyDesktopItems
+}:
+
+stdenv.mkDerivation rec {
+  pname = "popcorntime";
+  version = "0.4.9";
+
+  src = fetchurl {
+    url = "https://github.com/popcorn-official/popcorn-desktop/releases/download/v${version}/Popcorn-Time-${version}-linux64.zip";
+    sha256 = "sha256-cbKL5bgweZD/yfi/8KS0L7Raha8PTHqIm4qSPFidjUc=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+    unzip
+    wrapGAppsHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    gcc-unwrapped
+    gsettings-desktop-schemas
+    gtk3
+    nwjs
+    udev
+  ];
+
+  sourceRoot = ".";
+
+  dontWrapGApps = true;
+  dontUnpack = true;
+
+  makeWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}"
+    "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
+  ];
+
+  # Extract and copy executable in $out/bin
+  installPhase = ''
+    mkdir -p $out/share/applications $out/bin $out/opt/bin $out/share/icons/hicolor/scalable/apps/
+    # we can't unzip it in $out/lib, because nw.js will start with
+    # an empty screen. Therefore it will be unzipped in a non-typical
+    # folder and symlinked.
+    unzip -q $src -d $out/opt/popcorntime
+
+    ln -s $out/opt/popcorntime/Popcorn-Time $out/bin/popcorntime
+
+    ln -s $out/opt/popcorntime/src/app/images/icon.png $out/share/icons/hicolor/scalable/apps/popcorntime.png
+  '';
+
+  # GSETTINGS_SCHEMAS_PATH is not set in installPhase
+  preFixup = ''
+    wrapProgram $out/bin/popcorntime \
+      ''${makeWrapperArgs[@]} \
+      ''${gappsWrapperArgs[@]}
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/popcorn-official/popcorn-desktop";
+    description = "An application that streams movies and TV shows from torrents";
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl3;
+    maintainers = with maintainers; [ onny ];
+  };
+}
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "2.11.0";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    rev = "v${version}";
-    sha256 = "sha256-BMSLs12fPY8wat0rKys/7OI7F3GGNmQC+XRi6C4kYk4=";
+    sha256 = "sha256-S7mRSpqZTL38YlYHqtXdib7LZqodfEFqdAB98sAXOkA=";
  };

  vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY=";
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@ -794,6 +794,7 @@ rec {

  # This provides the ca bundle in common locations
  caCertificates = runCommand "ca-certificates" { } ''
+    mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs
    # Old NixOS compatibility.
    ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-bundle.crt
    # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@ -698,4 +698,21 @@ rec {
    tag = "latest";
    contents = [ pkgs.bashInteractive ./test-dummy ];
  };
+
+  # ensure that caCertificates builds
+  image-with-certs = buildImage {
+    name = "image-with-certs";
+    tag = "latest";
+
+    copyToRoot = pkgs.buildEnv {
+      name = "image-with-certs-root";
+      paths = [
+        pkgs.coreutils
+        pkgs.dockerTools.caCertificates
+      ];
+    };
+
+    config = {
+    };
+  };
 }
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@ -1,31 +1,17 @@
-{ dbus-glib
+{ stdenv
+, lib
 , fetchFromGitHub
 , gobject-introspection
 , pkg-config
-, lib
-, stdenv
-, wrapGAppsHook
-, python3
 , cairo
-, gnome
-, xapp
-, keybinder3
-, upower
-, callPackage
 , glib
-, libffi
-, gtk3
 , readline
 , spidermonkey_78
 , meson
-, sysprof
 , dbus
-, xvfb-run
 , ninja
-, makeWrapper
 , which
 , libxml2
-, gtk4
 }:

 stdenv.mkDerivation rec {
@ -45,13 +31,11 @@ stdenv.mkDerivation rec {
    meson
    ninja
    pkg-config
-    makeWrapper
    which # for locale detection
    libxml2 # for xml-stripblanks
  ];

  buildInputs = [
-    gtk4
    gobject-introspection
    cairo
    readline
@ -59,18 +43,8 @@ stdenv.mkDerivation rec {
    dbus # for dbus-run-session
  ];

-  checkInputs = [
-    xvfb-run
-  ];
-
  propagatedBuildInputs = [
    glib
-
-    # bindings
-    gnome.caribou
-    keybinder3
-    upower
-    xapp
  ];

  mesonFlags = [
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@ -1,49 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }:
+{ lib
+, mkXfceDerivation
+, imagemagick
+, libwnck
+, libxfce4ui
+, python3
+, xfce4-panel
+, xfconf
+}:

-stdenv.mkDerivation rec {
-  pname  = "xfce4-windowck-plugin";
-  version = "0.4.10";
-
-  src = fetchFromGitHub {
-    owner = "invidian";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-luCQzqWX3Jl2MlBa3vi1q7z1XOhpFxE8PUxscoIyBlA=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
+mkXfceDerivation {
+  category = "panel-plugins";
+  pname = "xfce4-windowck-plugin";
+  version = "0.5.0";
+  rev-prefix = "v";
+  odd-unstable = false;
+  sha256 = "sha256-MhNSgI74VLdoS5yL6nfRrVrPvv7+0P5meO4zQheYFzo=";

  buildInputs = [
-    python3
    imagemagick
    libwnck
    libxfce4ui
+    python3
    xfce4-panel
    xfconf
-    xfce4-dev-tools
  ];

-  preConfigure = ''
-    ./autogen.sh
-    patchShebangs .
+  postPatch = ''
+    patchShebangs themes/windowck{,-dark}/{xfwm4,unity}/generator.py
  '';

-  enableParallelBuilding = true;
-
-  passthru.updateScript = gitUpdater {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    rev-prefix = "v";
-  };
-
  meta = with lib; {
-    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin";
-    description = "Xfce plugins which allows to put the maximized window title and buttons on the panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    description = "Xfce panel plugin for displaying window title and buttons";
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ ] ++ teams.xfce.members;
  };
 }
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "gleam";
-  version = "0.22.1";
+  version = "0.23.0";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-/mP15jPZiiavnZ7fwFehSSzJUtVVmksj1xfbDOycxmQ=";
+    sha256 = "sha256-7KoJ00EMFWv14Zs9thCHqS7i7V4TdWIGcnEaOtHpKF4=";
  };

  nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ] ++
    lib.optionals stdenv.isDarwin [ Security libiconv ];

-  cargoSha256 = "sha256-JAQQiCnl/EMKCMqoL8WkwUcjng+MSz2Cjb3L5yyrQ+E=";
+  cargoSha256 = "sha256-YgQQK8Ojz+s+OohhpcsweW8hEdhmba/YcgDj6M6Ae00=";

  meta = with lib; {
    description = "A statically typed language for the Erlang VM";
--- a/pkgs/development/libraries/aptdec/default.nix
+++ b/pkgs/development/libraries/aptdec/default.nix
@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, libpng, libsndfile
+}:
+
+stdenv.mkDerivation {
+  pname = "aptdec";
+  version = "unstable-2022-05-18";
+
+  src = fetchFromGitHub {
+    owner = "Xerbo";
+    repo = "aptdec";
+    rev = "b1cc7480732349a7c772124f984b58f4c734c91b";
+    sha256 = "sha256-Fi9IkZcvqxpmHzqucpCr++37bmTtMy18P4LPznoaYIY=";
+  };
+
+  # fixes https://github.com/Xerbo/aptdec/issues/15
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace "-Werror" ""
+  '';
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libpng libsndfile ];
+
+  meta = with lib; {
+    description = "NOAA APT satellite imagery decoding library";
+    homepage = "https://github.com/Xerbo/aptdec";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ alexwinter ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/libraries/audio/game-music-emu/default.nix
+++ b/pkgs/development/libraries/audio/game-music-emu/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
    sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
  };
-  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
+  cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ];
  nativeBuildInputs = [ cmake removeReferencesTo ];

  # It used to reference it, in the past, but thanks to the postFixup hook, now
--- a/pkgs/development/libraries/dab_lib/default.nix
+++ b/pkgs/development/libraries/dab_lib/default.nix
@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, faad2, fftwFloat, zlib
+}:
+
+stdenv.mkDerivation {
+  pname = "dab_lib";
+  version = "unstable-2021-12-28";
+
+  src = fetchFromGitHub {
+    owner = "JvanKatwijk";
+    repo = "dab-cmdline";
+    rev = "d23adb3616bb11d98a909aceecb5a3b9507a674c";
+    sha256 = "sha256-n/mgsldgXEOLHZEL1cmsqXgFXByWoMeNXNoDWqPpipA=";
+  };
+
+  sourceRoot = "source/library/";
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ faad2 fftwFloat zlib ];
+
+  meta = with lib; {
+    description = "DAB/DAB+ decoding library";
+    homepage = "https://github.com/JvanKatwijk/dab-cmdline";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ alexwinter ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/libraries/dsdcc/default.nix
+++ b/pkgs/development/libraries/dsdcc/default.nix
@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, mbelib, serialdv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dsdcc";
+  version = "1.9.3";
+
+  src = fetchFromGitHub {
+    owner = "f4exb";
+    repo = "dsdcc";
+    rev = "v${version}";
+    sha256 = "sha256-8lO2c4fkQCaVO8IM05+Rdpo6oMxoEIObBm0y08i+/0k=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ mbelib serialdv ];
+
+  cmakeFlags = [
+    "-DUSE_MBELIB=ON"
+  ];
+
+  meta = with lib; {
+    description = "Digital Speech Decoder (DSD) rewritten as a C++ library";
+    homepage = "https://github.com/f4exb/dsdcc";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ alexwinter ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/default.nix
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
  };

  cmakeFlags = [
-    "-DTHREADSAFE=ON"
    "-DUSE_HTTP_PARSER=system"
    "-DUSE_SSH=ON"
    "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}"
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@ -67,7 +67,8 @@ let
      !(stdenv.hostPlatform.useLLVM or false) &&
      stdenv.cc.isGNU;

-    nativeBuildInputs = [ perl ];
+    nativeBuildInputs = [ perl ]
+      ++ lib.optionals static [ removeReferencesTo ];
    buildInputs = lib.optional withCryptodev cryptodev
      # perl is included to allow the interpreter path fixup hook to set the
      # correct interpreter in c_rehash.
@ -155,7 +156,7 @@ let
    postInstall =
    (if static then ''
      # OPENSSLDIR has a reference to self
-      ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
+      remove-references-to -t $out $out/lib/*.a
    '' else ''
      # If we're building dynamic libraries, then don't install static
      # libraries.
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@ -49,6 +49,7 @@ let
        withGtk3 = true;
        inherit (srcs.qtbase) src version;
        inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
+        patches = [ ./patches/0007-qtbase-xcursor.patch ];
      };

      qt3d = callPackage ./modules/qt3d.nix { };
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@ -201,6 +201,10 @@ stdenv.mkDerivation rec {
    "-DQT_FEATURE_openssl_linked=ON"
  ];

+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+  ];
+
  outputs = [ "out" "dev" ];

  postInstall = ''
--- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
+++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
@ -0,0 +1,29 @@
+From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Tue, 17 Sep 2019 05:35:58 -0500
+Subject: [PATCH 07/10] qtbase-xcursor
+
+---
+ src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
+index fbadab4d50..c83ce0af5b 100644
+--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
+@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
+     static bool function_ptrs_not_initialized = true;
+     if (function_ptrs_not_initialized) {
+-        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
+        QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
+         bool xcursorFound = xcursorLib.load();
+         if (!xcursorFound) { // try without the version number
+-            xcursorLib.setFileName(QLatin1String("Xcursor"));
+            xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
+             xcursorFound = xcursorLib.load();
+         }
+         if (xcursorFound) {
+-- 
+2.25.1
+
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@ -1,25 +1,43 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
-, libX11, libXext, qttools, wrapQtAppsHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, qmake
+, qtbase
+, qtsvg
+, qtx11extras
+, kwindowsystem
+, libX11
+, libXext
+, qttools
+, wrapQtAppsHook
 , gitUpdater
 }:

 stdenv.mkDerivation rec {
  pname = "qtstyleplugin-kvantum";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "tsujan";
    repo = "Kvantum";
    rev = "V${version}";
-    sha256 = "chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk=";
+    sha256 = "DJRTOpmmiB3VivZt66qaQwz7tp+sEMP+3E0dwUAkvXU=";
  };

  nativeBuildInputs = [
-    qmake qttools wrapQtAppsHook
+    qmake
+    qttools
+    wrapQtAppsHook
  ];

  buildInputs = [
-    qtbase qtsvg qtx11extras kwindowsystem libX11 libXext
+    qtbase
+    qtsvg
+    qtx11extras
+    kwindowsystem
+    libX11
+    libXext
  ];

  sourceRoot = "source/Kvantum";
--- a/pkgs/development/libraries/sgp4/default.nix
+++ b/pkgs/development/libraries/sgp4/default.nix
@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
+
+stdenv.mkDerivation {
+  pname = "sgp4";
+  version = "unstable-2021-01-11";
+
+  src = fetchFromGitHub {
+    owner = "dnwrnr";
+    repo = "sgp4";
+    rev = "ca9d4d97af4ee62461de6f13e0c85d1dc6000040";
+    sha256 = "sha256-56It/71R10U+Hnhw2tC16e5fZdyfQ8DLx6LVq65Rjvc=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "Simplified perturbations models library";
+    homepage = "https://github.com/dnwrnr/sgp4";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ alexwinter ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@ -1,4 +1,4 @@
-{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
+{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec
 , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
 , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
 , randomconv, alcotest
@ -19,6 +19,7 @@ buildDunePackage {
    dns-client
    dns-server
    dns-certify
+    dnssec
    bos
    cmdliner
    fpath
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@ -1,19 +1,20 @@
 { lib, buildDunePackage, fetchurl, alcotest
 , cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
+, base64
 }:

 buildDunePackage rec {
  pname = "dns";
-  version = "6.1.4";
+  version = "6.3.0";

  minimalOCamlVersion = "4.08";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
+    sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
  };

-  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
+  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];

  doCheck = true;
  checkInputs = [ alcotest ];
--- a/pkgs/development/ocaml-modules/dns/dnssec.nix
+++ b/pkgs/development/ocaml-modules/dns/dnssec.nix
@ -0,0 +1,30 @@
+{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
+, domain-name, logs
+, alcotest, base64
+}:
+
+buildDunePackage {
+  pname = "dnssec";
+
+  inherit (dns) version src;
+
+  propagatedBuildInputs = [
+    cstruct
+    dns
+    mirage-crypto
+    mirage-crypto-pk
+    mirage-crypto-ec
+    domain-name
+    logs
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    base64
+  ];
+
+  meta = dns.meta // {
+    description = "DNSSec support for OCaml-DNS";
+  };
+}
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@ -1,6 +1,6 @@
 { buildDunePackage, dns, dns-server, dns-mirage, lru, duration
 , randomconv, lwt, mirage-time, mirage-clock, mirage-random
-, tcpip, tls, tls-mirage
+, tcpip, tls, tls-mirage, dnssec
 , alcotest
 }:

@ -13,6 +13,7 @@ buildDunePackage {
    dns
    dns-server
    dns-mirage
+    dnssec
    lru
    duration
    randomconv
--- a/pkgs/development/python-modules/atenpdu/default.nix
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@ -1,23 +1,34 @@
 { lib
+, async-timeout
 , buildPythonPackage
 , fetchPypi
 , pysnmp
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "atenpdu";
-  version = "0.3.4";
+  version = "0.3.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-vvq8InmJUgvm/PpvZutpsBR3Fj1gR+xrkgfEGlw04Ek=";
+    hash = "sha256-MGxlzAEcd2EzIjAjY7/1xg1ZQhyL7dcFmCzfY9+jGJ4=";
  };

-  propagatedBuildInputs = [ pysnmp ];
+  propagatedBuildInputs = [
+    async-timeout
+    pysnmp
+  ];

  # Project has no test
  doCheck = false;
-  pythonImportsCheck = [ "atenpdu" ];
+
+  pythonImportsCheck = [
+    "atenpdu"
+  ];

  meta = with lib; {
    description = "Python interface to control ATEN PE PDUs";
--- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
@ -1,32 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
 , azure-common
 , azure-core
 , msrest
+, six
 }:

 buildPythonPackage rec {
  pname = "azure-keyvault-administration";
-  version = "4.1.1";
-  disabled = isPy27;
+  version = "4.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "sha256-m5dkKUZoPkpUzSW1K39+wpIfWHc2oRyxMetOf/Ybzuc=";
+    hash = "sha256-2Xuyx1dAJRgiDEetQu1qnzTua7l/G5eSWOTI/UI/z00=";
  };

  propagatedBuildInputs = [
    azure-common
    azure-core
    msrest
+    six
  ];

  # no tests in pypi tarball
  doCheck = false;

-  pythonNamespaces = [ "azure.keyvault" ];
+  pythonNamespaces = [
+    "azure.keyvault"
+  ];

-  pythonImportsCheck = [ "azure.keyvault.administration" ];
+  pythonImportsCheck = [
+    "azure.keyvault.administration"
+  ];

  meta = with lib; {
    description = "Microsoft Azure Key Vault Administration Client Library for Python";
--- a/pkgs/development/python-modules/boost-histogram/default.nix
+++ b/pkgs/development/python-modules/boost-histogram/default.nix
@ -1,23 +1,43 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pythonOlder
+, boost
+, numpy
+, pytestCheckHook
+, pytest-benchmark
+, setuptools-scm
+}:

 buildPythonPackage rec {
  pname = "boost-histogram";
-  version = "1.3.1";
-  disabled = !isPy3k;
+  version = "1.3.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";

  src = fetchPypi {
    pname = "boost_histogram";
    inherit version;
-    sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8=";
+    hash = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro=";
  };

-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];

-  buildInputs = [ boost ];
+  buildInputs = [
+    boost
+  ];

-  propagatedBuildInputs = [ numpy ];
+  propagatedBuildInputs = [
+    numpy
+  ];

-  checkInputs = [ pytestCheckHook pytest-benchmark ];
+  checkInputs = [
+    pytestCheckHook
+    pytest-benchmark
+  ];

  meta = with lib; {
    description = "Python bindings for the C++14 Boost::Histogram library";
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "cftime";
-  version = "1.6.1";
+  version = "1.6.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-URIV9F7XzHnq2EAg6I4fxHa4q6cbR9L83vjmUkJAaSc=";
+    sha256 = "sha256-hhTAD7ilBG3jBP3Ybb0iT5lAgYXXskWsZijQJ2WW5tI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, ddt
 , fetchFromGitHub
 , importlib-metadata
 , jsonschema
@ -20,7 +21,7 @@

 buildPythonPackage rec {
  pname = "cyclonedx-python-lib";
-  version = "2.7.1";
+  version = "3.1.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -29,7 +30,7 @@ buildPythonPackage rec {
    owner = "CycloneDX";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
+    hash = "sha256-pbwhjxlEdne426CiUORSM8w6MXpgpjMWoH37TnXxA5s=";
  };

  nativeBuildInputs = [
@ -48,9 +49,10 @@ buildPythonPackage rec {
  ];

  checkInputs = [
-    pytestCheckHook
+    ddt
    jsonschema
    lxml
+    pytestCheckHook
    xmldiff
  ];

--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@ -18,15 +18,15 @@

 buildPythonPackage rec {
  pname = "diff-cover";
-  version = "6.5.1";
+  version = "7.0.1";
  format = "setuptools";

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

  src = fetchPypi {
    pname = "diff_cover";
    inherit version;
-    hash = "sha256-jDuxOBLpZnvIP4x2BkAlEenC/nnWeG8SlSLnlpPuCWs=";
+    hash = "sha256-aSWDVdr4J2BXqS5CzsUllK2M/n3VBdbw5W/kQLxEGNA=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/dparse/default.nix
+++ b/pkgs/development/python-modules/dparse/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy27
+, pythonOlder
 , toml
 , pyyaml
 , packaging
@ -10,12 +10,14 @@

 buildPythonPackage rec {
  pname = "dparse";
-  version = "0.6.0";
-  disabled = isPy27;
+  version = "0.6.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-VwaLthhZsWdsa+sQ85mQbuy0GnW10/vJnQMRBZy2chM=";
+    hash = "sha256-1FJVvaIfmYvH3fKv1eYlBbphNHVrotQqhMVrCCZhTf4=";
  };

  propagatedBuildInputs = [
@ -28,6 +30,10 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  pythonImportsCheck = [
+    "dparse"
+  ];
+
  disabledTests = [
    # requires unpackaged dependency pipenv
    "test_update_pipfile"
--- a/pkgs/development/python-modules/evtx/default.nix
+++ b/pkgs/development/python-modules/evtx/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "evtx";
-  version = "0.7.3";
+  version = "0.8.1";
  format = "pyproject";

  disabled = pythonOlder "3.6";
@ -18,13 +18,13 @@ buildPythonPackage rec {
    owner = "omerbenamram";
    repo = "pyevtx-rs";
    rev = version;
-    sha256 = "sha256-59iEmgF1m+Yr5k4oxZGqMs5oMZxToUFYuwQDeLEQ2jY=";
+    sha256 = "sha256-MSQYp/qkntFcnGqGhJ+0i4eMGzcDJcSZ44qFARMYM2I=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    sha256 = "sha256-Q2SpJohLSQCMYmx1ZMWZ7a/NC0lPsHkwxom00qVooNM=";
+    sha256 = "sha256-kzv2ppRjkmXgMxJviBwRVXMiGWBlhBqLXEmmRvwlw98=";
  };

  nativeBuildInputs = with rustPlatform; [
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-asset";
-  version = "3.13.1";
+  version = "3.14.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-FEgsqN1rgkryreNNotwzfErYAdwAjiJ9M7TfVJtQXUc=";
+    hash = "sha256-gRM4tOq3nXV6koBNqBxwY3OS576E8gnVjzwDAsS2Ols=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@ -9,11 +9,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-bigquery-storage";
-  version = "2.15.0";
+  version = "2.16.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-v0g6gK4cmELH1cmRl9EDJceEOW3vKgR9GSZ2oHKzrG0=";
+    sha256 = "sha256-5CIRh3g4MLRMo5MwalOjJYIgM3eoiHI6i7MVMs9c04Q=";
  };

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

 buildPythonPackage rec {
  pname = "google-cloud-container";
-  version = "2.11.2";
+  version = "2.12.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-GYkO1gPaEFtlKRZqatwFkPZwb9rr42jmzSz/S1UoWrs=";
+    hash = "sha256-8zf8PYSOI0KE1P4wAjcehuEzPKZ7RdQlxdUGWYygzIM=";
  };

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

 buildPythonPackage rec {
  pname = "google-cloud-firestore";
-  version = "2.6.1";
+  version = "2.7.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-BgCO9G9MwSonZSZ9sAQuTurGXLTJXsCC73QalBsACRY=";
+    sha256 = "sha256-Pi0nRYBfw2A2Bz/i8b+ddtrji2q5Ug1wyo40Vok1MXk=";
  };

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

 buildPythonPackage rec {
  pname = "google-cloud-spanner";
-  version = "3.20.0";
+  version = "3.21.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-3KnpesMoqjjXgHjHihLN8cnYjtO07sbjHL1G4ZyInZ8=";
+    sha256 = "sha256-47fR2Pwwl9HJ5pIqf8H0QjmrVYy5NgN5sdk3nH4yf/Q=";
  };

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

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2022.9.0";
+  version = "2022.9.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-LFgbZIEtHAnLPb5JPU//tAXKsvSidqT/JsVIr5uoKNs=";
+    sha256 = "sha256-OWEF1CJ4ZW64P4w3M+uur/NKCmjhS1c19izA041cC8A=";
  };

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

 buildPythonApplication rec {
  pname = "mkdocs-redirects";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "mkdocs";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-iJmNh81VVqaPWHL3d8u+hESlW3AhlCr/Ax9n5nOTd0o=";
+    sha256 = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E=";
  };

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

 buildPythonPackage rec {
  pname = "mlflow";
-  version = "1.28.0";
+  version = "1.29.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-aXZp4eQuiHwzBQKuTw7WROgUvgas2pDOpEU57M4zSmQ=";
+    hash = "sha256-+tUYYA9RW8gcv3cFPVBrdpRBIpEFtqS/hXX+qmOgDak=";
  };

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

  disabled = !isPy3k;

-  buildInputs = [ libGL libX11 glcontext ];
+  buildInputs = [ libGL libX11 ];
+  propagatedBuildInputs = [ glcontext ];

  # Tests need a display to run.
  doCheck = false;
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "mypy-boto3-s3";
-  version = "1.24.36.post1";
+  version = "1.24.76";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-O9fgb5reUFnq4hgdep8aQef6gHrT6UwByZAYOOh+Cr4=";
+    hash = "sha256-ciU2L9bw2JS1IWFf4SSVWFb/jx7NrlN1rCCzNL60rZw=";
  };

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

 buildPythonPackage rec {
  pname = "neo4j";
-  version = "5.0.0";
+  version = "5.0.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "neo4j";
    repo = "neo4j-python-driver";
    rev = "refs/tags/${version}";
-    hash = "sha256-I3RAsCpfaDcW0L89lOff2zCQc+6B6eNvuWKgV7G2Bws=";
+    hash = "sha256-R4+cShkG1c3PRiU92OPPEVsXR4zt0G/7ZJcYACtPvHs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/overpy/default.nix
+++ b/pkgs/development/python-modules/overpy/default.nix
@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "overpy";
+  version = "0.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "DinoTools";
+    repo = "python-overpy";
+    rev = version;
+    hash = "sha256-Tl+tzxnPASL4J6D/BYCEWhXe/mI12OVgNT5lyby3s7A=";
+  };
+
+  patches = [
+    (fetchpatch {
+      # Remove pytest-runner
+      url = "https://patch-diff.githubusercontent.com/raw/DinoTools/python-overpy/pull/104.patch";
+      hash = "sha256-ScS0vd2P+wyQGyCQV6/4cUcqoQ+S07tGpEovuz9oBMw=";
+    })
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "overpy"
+  ];
+
+  meta = with lib; {
+    description = "Python Wrapper to access the Overpass API";
+    homepage = "https://github.com/DinoTools/python-overpy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ firefly-cpp ];
+  };
+}
--- 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 = "5.18.3";
+  version = "5.18.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-PCWxhJd2ZK7qt0Co5jKZSP4eOBIO+iVvQHFDbTViDAs=";
+    hash = "sha256-z7gbVphpeDGHJJESk/HsaJ4MXD3reqp7iGoC/c867Ls=";
  };

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

 buildPythonPackage rec {
  pname = "pex";
-  version = "2.1.104";
+  version = "2.1.105";
  format = "flit";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ToDNuTNVKtjjaT/6KwQbjcNPr9SLcpQfabd64rxg8PA=";
+    hash = "sha256-d6ORAkbg6gEL6tzk8DqAO9UDWrLTfH8Vwsy56EQi+ms=";
  };

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

 buildPythonPackage rec {
  pname = "pick";
-  version = "2.0.0";
+  version = "2.0.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "wong2";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-fuhQFytJCVmNlMiqhuM6xD+BjmLMX3quPAyJNHE/cdY=";
+    sha256 = "sha256-W7jEVe2HvkZp3hFQpoqT8M7eYxwj2hfsOIhM0WZPvr8=";
  };

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

 buildPythonPackage rec {
  pname = "plaid-python";
-  version = "9.9.0";
+  version = "10.0.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-uvozG1l+aGDs4nzOOjKUPScLLMNVop5u2Y89se8GvtY=";
+    hash = "sha256-dhFc4QCvWrb4gYdMaNlaCRaRrWsuUY+leTkoEhFHHds=";
  };

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

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "0.22.0";
+  version = "0.22.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = "python-plugwise";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-cUPomT6vmJO+YjEzLOOZ6YIAaBmN1fTWNYwLji15B7o=";
+    sha256 = "sha256-vgHfdfyKzabYdsHtCMXcfQexYYxw17bKjNr8wSPBFvI=";
  };

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

 buildPythonPackage rec {
  pname = "pydeps";
-  version = "1.10.22";
+  version = "1.10.24";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,8 +18,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "thebjorn";
    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-PA+TpPAuzyAQSlD08ZgmZAKgVEGoIUw/zq4QdTmU8HE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yDHIZk6+9K5hg4Q6pydd4NwnxSU1+u+dGUiUQph9ccY=";
  };

  buildInputs = [
--- a/pkgs/development/python-modules/pytenable/default.nix
+++ b/pkgs/development/python-modules/pytenable/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "pytenable";
-  version = "1.4.7";
+  version = "1.4.8";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "tenable";
    repo = "pyTenable";
    rev = "refs/tags/${version}";
-    hash = "sha256-w6IM82nxv6rg3XbrHZfoN517usOOo/ly1GGgjnIdcEw=";
+    hash = "sha256-alBEKCYwLIbQanKTzkd3NnfOudhGhKhg4sFqddWdzQA=";
  };

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

 buildPythonPackage rec {
  pname   = "pytorch-metric-learning";
-  version = "1.6.0";
+  version = "1.6.2";

  disabled = isPy27;

@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "KevinMusgrave";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-DmipbtzfCkd85dZ/ECPT8tkwmt5AKPD6oWF3X7vRJPo=";
+    sha256 = "sha256-y/KqMqxSzTGsjwtbhHbFK+S4CX6yHC6tR6jdPWUzeGg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "scikit-hep-testdata";
-  version = "0.4.20";
+  version = "0.4.21";
  format = "pyproject";

  # fetch from github as we want the data files
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "scikit-hep";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-xUXHacUIOr309HCHpzFw0g4i0bgiYcvYTCwBBbVVlR0=";
+    sha256 = "sha256-DhOtoxjhczsYqOn+CwLGlRIPa2hh7mH6EfwcLLPMQcw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@ -36,7 +36,6 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "servefile" ];

  meta = with lib; {
-    broken = stdenv.isDarwin;
    description = "Serve files from shell via a small HTTP server";
    homepage = "https://github.com/sebageek/servefile";
    license = licenses.gpl3Plus;
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@ -6,17 +6,20 @@
 , pastedeploy
 , paste
 , pydispatcher
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "sqlobject";
-  version = "3.9.1";
+  version = "3.10.0";
  format = "setuptools";

+  disabled = pythonOlder "3.7";
+
  src = fetchPypi {
    pname = "SQLObject";
    inherit version;
-    sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921";
+    hash = "sha256-i/wBFu8z/DS5Gtj00ZKrbuPsvqDH3O5GmbrknGbvJ7A=";
  };

  propagatedBuildInputs = [
@ -42,7 +45,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Object Relational Manager for providing an object interface to your database";
    homepage = "http://www.sqlobject.org/";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Only;
    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix
+++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "starkbank-ecdsa";
-  version = "2.0.3";
+  version = "2.1.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "starkbank";
    repo = "ecdsa-python";
    rev = "v${version}";
-    sha256 = "sha256-UA+UuSxKZZN7Zb23HWsCD6UZK6lROpy3OfLN7MAlMM0=";
+    sha256 = "sha256-N7TV4o7u4YRymFrRNtSPbjobEu+X2QtnkPHcnZW3zTY=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@ -1,7 +1,9 @@
 { lib
 , buildPythonPackage
+, django
 , fetchFromGitHub
 , mock
+, multidict
 , pyjwt
 , pytestCheckHook
 , pythonOlder
@ -11,7 +13,7 @@

 buildPythonPackage rec {
  pname = "twilio";
-  version = "7.13.0";
+  version = "7.14.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -20,7 +22,7 @@ buildPythonPackage rec {
    owner = "twilio";
    repo = "twilio-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-FlleulcjroFyzI6JWr1sUe/jgXlevHwzZZpyAvCQRu8=";
+    hash = "sha256-+D2zhWm2//eWJyEpMQIZM/lL4u7o3JQjGwUebbJKjQk=";
  };

  propagatedBuildInputs = [
@ -30,7 +32,9 @@ buildPythonPackage rec {
  ];

  checkInputs = [
+    django
    mock
+    multidict
    pytestCheckHook
  ];

--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@ -41,6 +41,11 @@ buildPythonPackage rec {
    substituteInPlace setup.cfg \
      --replace "--cov=watchdog" "" \
      --replace "--cov-report=term-missing" ""
+  '' + lib.optionalString stdenv.hostPlatform.isMusl
+  # https://github.com/gorakhargosh/watchdog/issues/920
+  ''
+    substituteInPlace tests/test_inotify_c.py \
+      --replace "Unknown error -1" "No error information"
  '';

  disabledTests = [
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "buildah";
-  version = "1.27.1";
+  version = "1.27.2";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "buildah";
    rev = "v${version}";
-    sha256 = "sha256-WTb64VhVst3E0bct51EmsfeloTDLe2zXsy5tDDvX2rI=";
+    sha256 = "sha256-jEAfiPNb7qpbKiKDx6slnBeR0fISalebAedBfY7OS6E=";
  };

  outputs = [ "out" "man" ];
--- a/pkgs/development/tools/changie/default.nix
+++ b/pkgs/development/tools/changie/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "changie";
-  version = "1.9.0";
+  version = "1.9.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "miniscruff";
    repo = pname;
-    sha256 = "sha256-3i+GInsxGeHXdFYfI664sOshHFsEIVXgXolzPhc9eoM=";
+    sha256 = "sha256-3AGz84z0YmDiLxlbDO0f9ny75hyLB4fnYQSICElJVK4=";
  };

-  vendorSha256 = "sha256-/tYhoHk4+gbdfeBNqcBSM0y4V3tVH67Xta3+e+Sctsg=";
+  vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg=";

  meta = with lib; {
    homepage = "https://changie.dev";
--- a/pkgs/development/tools/rust/cargo-ui/default.nix
+++ b/pkgs/development/tools/rust/cargo-ui/default.nix
@ -0,0 +1,57 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, cmake
+, pkg-config
+, makeWrapper
+, openssl
+, stdenv
+, fontconfig
+, libGL
+, libX11
+, libXcursor
+, libXi
+, libXrandr
+, libxcb
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-ui";
+  version = "0.3.2";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-IL7BxiJg6eTuFM0pJ3qLxYCVofE/RjmgQjvOW96QF9A=";
+  };
+
+  cargoSha256 = "sha256-16mgp7GsjbizzCWN3MDpl6ps9CK1zdIpLiyNiKYjDI4=";
+
+  nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [
+    makeWrapper
+  ];
+
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
+    fontconfig
+    libGL
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+    libxcb
+  ];
+
+  postInstall = lib.optionalString stdenv.isLinux ''
+    wrapProgram $out/bin/cargo-ui \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
+  '';
+
+  meta = with lib; {
+    description = "A GUI for Cargo";
+    homepage = "https://github.com/slint-ui/cargo-ui";
+    changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ mit asl20 gpl3Only ];
+    maintainers = with maintainers; [ figsoda ];
+    # figsoda: I can't figure how to make it build on darwin
+    broken = stdenv.isDarwin;
+  };
+}
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@ -27,11 +27,11 @@ rec {
  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;

  production = generic {
-    version = "515.65.01";
-    sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek=";
-    openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
-    settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
-    persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
+    version = "515.76";
+    sha256_64bit = "sha256-xqKhjOuWX0mAvOTlzqNv1iLNwaXzGg6xu9NZqen2v0Q=";
+    openSha256 = "sha256-843l42atzaTm4pX5UC/JZjXAvhwmBpE8k3SQFEFdcdY=";
+    settingsSha256 = "sha256-2GdqmuvROLa8xFfyFY/F4YzEBq+SlVIYM4CVEARh9MI=";
+    persistencedSha256 = "sha256-nIfP7xBIVy+BUa9VBCNQ9v5RT4l4S9X0GHLpNiN/WRg=";

    brokenOpen = kernelModVersion == "5.4" && kernel.isHardened;
  };
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@ -24,14 +24,14 @@
 assert (!libsOnly) -> kernel != null;

 stdenv.mkDerivation rec {
-  version = "18.0.1-53056";
+  version = "18.0.2-53077";
  pname = "prl-tools";

  # We download the full distribution to extract prl-tools-lin.iso from
  # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
  src = fetchurl {
    url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";
-    sha256 = "sha256-igIRWLKbgU8pQrsK+lyjP8aodylXjRrRlOlaP5KbHm8=";
+    sha256 = "sha256-yrCg3qr96SUCHmT3IAF79/Ha+L82V3nIC6Hb5ugXoGk=";
  };

  hardeningDisable = [ "pic" "format" ];
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@ -1,6 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub, nixosTests }:
 let
-  version = "2.5.2";
+  version = "2.6.0";
  dist = fetchFromGitHub {
    owner = "caddyserver";
    repo = "dist";
@ -18,10 +18,10 @@ buildGoModule {
    owner = "caddyserver";
    repo = "caddy";
    rev = "v${version}";
-    sha256 = "sha256-Z9A2DRdX0LWjIKdHAHk2IRxsUzvC90Gf5ohFLXNHcsw=";
+    sha256 = "sha256-BZGfYpQM5e+/LrGqs1oms/vOp9q4UY/ZyDODEsi/wl8=";
  };

-  vendorSha256 = "sha256-aB95wEc69nhloF8qoBeIiiitSyiUTc2KpxyCEnge4rc=";
+  vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI=";

  postInstall = ''
    install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, docutils, libev, openssl, pkg-config, nixosTests }:
 stdenv.mkDerivation rec {
-  version = "1.7.2";
+  version = "1.7.3";
  pname = "hitch";

  src = fetchurl {
    url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz";
-    sha256 = "sha256-3NZcvsYofGIqWjF9Xzfh6lUm2qk/tNso9CBvyZEaF4U=";
+    sha256 = "sha256-Ghv0lV13W3GNwxyJoaBRdlMLDKhW+V7kKivHoj8ol4c=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "check_ssl_cert";
-  version = "2.45.0";
+  version = "2.46.0";

  src = fetchFromGitHub {
    owner = "matteocorti";
    repo = "check_ssl_cert";
    rev = "v${version}";
-    hash = "sha256-JmSSGt6rm4eSOVIT9eDN8FmQogG8kevHE2jgZfCzmgU=";
+    hash = "sha256-19goHso7jfG5agLB2xetYP2nv0HuXhXYDB6vBC0Pr5M=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "ibus-libpinyin";
-  version = "1.13.0";
+  version = "1.13.1";

  src = fetchFromGitHub {
    owner = "libpinyin";
    repo = "ibus-libpinyin";
    rev = version;
-    sha256 = "sha256-/l+0CfesJp2ITd2EL1Bbz+XGNmw9sDd3A+v57kDBvO8=";
+    sha256 = "sha256-uIK/G3Yk2xdPDnLtnx8sGShNY2gY0TmaEx5zyraawz0=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/misc/nitch/default.nix
+++ b/pkgs/tools/misc/nitch/default.nix
@ -0,0 +1,28 @@
+{ lib, nimPackages, fetchFromGitHub, fetchpatch }:
+nimPackages.buildNimPackage rec {
+  pname = "nitch";
+  version = "0.1.6";
+  nimBinOnly = true;
+  src = fetchFromGitHub {
+    owner = "unxsh";
+    repo = "nitch";
+    rev = "42ad6899931dd5e0cec7b021c2b7e383fcc891f3";
+    hash = "sha256-QI7CbP0lvvjD+g29FR/YJjuZboZ+PoHynsNbpYC9SvE=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch";
+      sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Incredibly fast system fetch written in nim";
+    homepage = "https://github.com/unxsh/nitch";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ quasigod-io ];
+    mainProgram = "nitch";
+  };
+}
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@ -68,5 +68,6 @@ python3Packages.buildPythonPackage rec {
    license = licenses.bsd2;
    platforms = platforms.unix;
    maintainers = with maintainers; [ benley lassulus pinpox ];
+    mainProgram = "ykman";
  };
 }
--- a/pkgs/tools/networking/getmail6/default.nix
+++ b/pkgs/tools/networking/getmail6/default.nix
@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
    # getmail spends a lot of effort to build an absolute path for
    # documentation installation; too bad it is counterproductive now
    sed -e '/datadir or prefix,/d' -i setup.py
+    sed -e 's,/usr/bin/getmail,$(dirname $0)/getmail,' -i getmails
  '';

  meta = with lib; {
--- a/pkgs/tools/security/chain-bench/default.nix
+++ b/pkgs/tools/security/chain-bench/default.nix
@ -6,15 +6,15 @@

 buildGoModule rec {
  pname = "chain-bench";
-  version = "0.1.3";
+  version = "0.1.4";

  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-qNprOxp8PKV5nld4uDGH0I0KG0r5sH7vr6It62J8RXc=";
+    sha256 = "sha256-H0CSeZ7plMJJ3vaf+ihm/PQMPw4DnNsAaVsH4zP8wqs=";
  };
-  vendorSha256 = "sha256-54q486c/uUpatLQ3/FiVZxqu9NCkzcf8yQUZnAtrqYg=";
+  vendorSha256 = "sha256-wBt0NbRJdU9yfRx2aIA5P6Q0Q3oysJBnfFbAx1yr3fI=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/tools/security/coercer/default.nix
+++ b/pkgs/tools/security/coercer/default.nix
@ -0,0 +1,36 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "coercer";
+  version = "1.6";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "p0dalirius";
+    repo = "Coercer";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xftYnwu6uUTvJTZU9E7wvdgBxqa8xy83K5GOlgNSCvc=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    impacket
+  ];
+
+  pythonImportsCheck = [
+    "coercer"
+  ];
+
+  meta = with lib; {
+    description = "Tool to automatically coerce a Windows server";
+    homepage = "https://github.com/p0dalirius/Coercer";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/tools/security/crackql/default.nix
+++ b/pkgs/tools/security/crackql/default.nix
@ -0,0 +1,37 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "crackql";
+  version = "unstable-20220821";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "nicholasaleks";
+    repo = "CrackQL";
+    # rev = "refs/tags/${version}";
+    # Switch to tag with the next update
+    rev = "5bcf92f4520a4dd036baf9f47c5ebbf18e6a032a";
+    hash = "sha256-XlHbGkwdOV1nobjtQP/M3IIEuzXHBuwf52EsXf3MWoM=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    requests
+    graphql-core
+    jinja2
+    typing-extensions
+  ];
+
+  meta = with lib; {
+    description = "GraphQL password brute-force and fuzzing utility";
+    homepage = "https://github.com/nicholasaleks/CrackQL";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/tools/security/dismember/default.nix
+++ b/pkgs/tools/security/dismember/default.nix
@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "dismember";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "liamg";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-myoBXoi7VqHOLmu/XrvnlfBDlEnXm+0fp8WQec+3EJY=";
+  };
+
+  vendorSha256 = "sha256-xxZQz94sr7aSNhmvFWdRtVnS0yk2KQIkAHjwZeJPBwY=";
+
+  meta = with lib; {
+    description = "Tool to scan memory for secrets";
+    homepage = "https://github.com/liamg/dismember";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/tools/security/graphinder/default.nix
+++ b/pkgs/tools/security/graphinder/default.nix
@ -0,0 +1,55 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "graphinder";
+  version = "1.11.5";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "Escape-Technologies";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ds0XPDDeBtN9AXGIyxqj9aDJyQWekWVL8zbSYRKWw18=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    aiohttp
+    beautifulsoup4
+    requests
+    setuptools
+  ];
+
+  checkInputs = with python3.pkgs; [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "graphinder"
+  ];
+
+  disabledTests = [
+    # Tests require network access
+    "test_domain_class"
+    "test_extract_file_zip"
+    "test_fetch_assets"
+    "test_full_run"
+    "test_init_domain_tasks"
+    "test_is_gql_endpoint"
+  ];
+
+  meta = with lib; {
+    description = "Tool to find GraphQL endpoints using subdomain enumeration";
+    homepage = "https://github.com/Escape-Technologies/graphinder";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/tools/security/silenthound/default.nix
+++ b/pkgs/tools/security/silenthound/default.nix
@ -0,0 +1,43 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "silenthound";
+  version = "unstable-2022-09-02";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "layer8secure";
+    repo = "SilentHound";
+    rev = "44d361f6c95b79bd848603c8050af86db3d072b0";
+    hash = "sha256-6JcU6FIE+9fsMawI1RSNQyx9ubjxmchEKmeg6/kmI4s=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    colorama
+    ldap
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -vD $pname.py $out/bin/$pname
+
+    runHook postInstall
+  '';
+
+  # Only script available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Tool to enumerate an Active Directory Domain";
+    homepage = "https://github.com/layer8secure/SilentHound";
+    # Unknown license, https://github.com/layer8secure/SilentHound/issues/1
+    license = licenses.unfree;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "asciidoctorj";
-  version = "2.5.5";
+  version = "2.5.6";

  src = fetchzip {
    url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "sha256-0MWZKT4TkgNEJPP0HRc316P2AFeZ2gh+mu30X0y3Otc=";
+    sha256 = "sha256-oAakldNmSWMAgbHRZm9jY9QRFdQamrAsDyD0havivr0=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/virtualization/kubevirt/default.nix
+++ b/pkgs/tools/virtualization/kubevirt/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "kubevirt";
-  version = "0.56.1";
+  version = "0.57.0";

  src = fetchFromGitHub {
    owner = "kubevirt";
    repo = "kubevirt";
    rev = "v${version}";
-    sha256 = "sha256-PYVV/0qCBhR2l+rLuoPTe3FvLX9NmHHcA9gOeUj1IVw=";
+    sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU=";
  };

  vendorSha256 = null;
--- a/Show more
+++ b/Show more