Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-01-27 12:01:12 +00:00 committed by GitHub
commit ef4dd61b7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
43 changed files with 522 additions and 242 deletions

View File

@ -67,6 +67,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [RustDesk](https://rustdesk.com), a full-featured open source remote control alternative for self-hosting and security with minimal configuration. Alternative to TeamViewer.
- [systemd-lock-handler](https://git.sr.ht/~whynothugo/systemd-lock-handler/), a bridge between logind D-Bus events and systemd targets. Available as [services.systemd-lock-handler.enable](#opt-services.systemd-lock-handler.enable).
## Backward Incompatibilities {#sec-release-24.05-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -240,15 +242,15 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0.
- The following options of the Nextcloud module were moved into [`services.nextcloud.extraOptions`](#opt-services.nextcloud.extraOptions) and renamed to match the name from Nextcloud's `config.php`:
- `logLevel` -> [`loglevel`](#opt-services.nextcloud.extraOptions.loglevel),
- `logType` -> [`log_type`](#opt-services.nextcloud.extraOptions.log_type),
- `defaultPhoneRegion` -> [`default_phone_region`](#opt-services.nextcloud.extraOptions.default_phone_region),
- `overwriteProtocol` -> [`overwriteprotocol`](#opt-services.nextcloud.extraOptions.overwriteprotocol),
- `skeletonDirectory` -> [`skeletondirectory`](#opt-services.nextcloud.extraOptions.skeletondirectory),
- `globalProfiles` -> [`profile.enabled`](#opt-services.nextcloud.extraOptions._profile.enabled_),
- `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains) and
- `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.extraOptions.trusted_proxies).
- The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`:
- `logLevel` -> [`loglevel`](#opt-services.nextcloud.settings.loglevel),
- `logType` -> [`log_type`](#opt-services.nextcloud.settings.log_type),
- `defaultPhoneRegion` -> [`default_phone_region`](#opt-services.nextcloud.settings.default_phone_region),
- `overwriteProtocol` -> [`overwriteprotocol`](#opt-services.nextcloud.settings.overwriteprotocol),
- `skeletonDirectory` -> [`skeletondirectory`](#opt-services.nextcloud.settings.skeletondirectory),
- `globalProfiles` -> [`profile.enabled`](#opt-services.nextcloud.settings._profile.enabled_),
- `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.settings.trusted_domains) and
- `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.settings.trusted_proxies).
- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream.
The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).

View File

@ -1236,6 +1236,7 @@
./services/system/saslauthd.nix
./services/system/self-deploy.nix
./services/system/systembus-notify.nix
./services/system/systemd-lock-handler.nix
./services/system/uptimed.nix
./services/system/zram-generator.nix
./services/torrent/deluge.nix

View File

@ -0,0 +1,47 @@
# systemd-lock-handler {#module-services-systemd-lock-handler}
The `systemd-lock-handler` module provides a service that bridges
D-Bus events from `logind` to user-level systemd targets:
- `lock.target` started by `loginctl lock-session`,
- `unlock.target` started by `loginctl unlock-session` and
- `sleep.target` started by `systemctl suspend`.
You can create a user service that starts with any of these targets.
For example, to create a service for `swaylock`:
```nix
{
services.systemd-lock-handler.enable = true;
systemd.user.services.swaylock = {
description = "Screen locker for Wayland";
documentation = ["man:swaylock(1)"];
# If swaylock exits cleanly, unlock the session:
onSuccess = ["unlock.target"];
# When lock.target is stopped, stops this too:
partOf = ["lock.target"];
# Delay lock.target until this service is ready:
before = ["lock.target"];
wantedBy = ["lock.target"];
serviceConfig = {
# systemd will consider this service started when swaylock forks...
Type = "forking";
# ... and swaylock will fork only after it has locked the screen.
ExecStart = "${lib.getExe pkgs.swaylock} -f";
# If swaylock crashes, always restart it immediately:
Restart = "on-failure";
RestartSec = 0;
};
};
}
```
See [upstream documentation](https://sr.ht/~whynothugo/systemd-lock-handler) for more information.

View File

@ -0,0 +1,27 @@
{ config
, pkgs
, lib
, ...
}:
let
cfg = config.services.systemd-lock-handler;
inherit (lib) mkIf mkEnableOption mkPackageOption;
in
{
options.services.systemd-lock-handler = {
enable = mkEnableOption (lib.mdDoc "systemd-lock-handler");
package = mkPackageOption pkgs "systemd-lock-handler" { };
};
config = mkIf cfg.enable {
systemd.packages = [ cfg.package ];
# https://github.com/NixOS/nixpkgs/issues/81138
systemd.user.services.systemd-lock-handler.wantedBy = [ "default.target" ];
};
meta = {
maintainers = with lib.maintainers; [ liff ];
doc = ./systemd-lock-handler.md;
};
}

View File

@ -116,7 +116,7 @@ in
}
(lib.mkIf cfg.bendDomainToLocalhost {
nextcloud.extraOptions.trusted_proxies = [ "127.0.0.1" "::1" ];
nextcloud.settings.trusted_proxies = [ "127.0.0.1" "::1" ];
})
];
};

View File

@ -51,7 +51,7 @@ to ensure that changes can be applied by changing the module's options.
In case the application serves multiple domains (those are checked with
[`$_SERVER['HTTP_HOST']`](https://www.php.net/manual/en/reserved.variables.server.php))
it's needed to add them to
[`services.nextcloud.extraOptions.trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains).
[`services.nextcloud.settings.trusted_domains`](#opt-services.nextcloud.settings.trusted_domains).
Auto updates for Nextcloud apps can be enabled using
[`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable).

View File

@ -183,8 +183,8 @@ let
];
$CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file(
"${jsonFormat.generate "nextcloud-extraOptions.json" cfg.extraOptions}",
"impossible: this should never happen (decoding generated extraOptions file %s failed)"
"${jsonFormat.generate "nextcloud-settings.json" cfg.settings}",
"impossible: this should never happen (decoding generated settings file %s failed)"
));
${optionalString (cfg.secretFile != null) ''
@ -205,21 +205,22 @@ in {
Add port to services.nextcloud.config.dbhost instead.
'')
(mkRenamedOptionModule
[ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "extraOptions" "loglevel" ])
[ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "settings" "loglevel" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "logType" ] [ "services" "nextcloud" "extraOptions" "log_type" ])
[ "services" "nextcloud" "logType" ] [ "services" "nextcloud" "settings" "log_type" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "config" "defaultPhoneRegion" ] [ "services" "nextcloud" "extraOptions" "default_phone_region" ])
[ "services" "nextcloud" "config" "defaultPhoneRegion" ] [ "services" "nextcloud" "settings" "default_phone_region" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "config" "overwriteProtocol" ] [ "services" "nextcloud" "extraOptions" "overwriteprotocol" ])
[ "services" "nextcloud" "config" "overwriteProtocol" ] [ "services" "nextcloud" "settings" "overwriteprotocol" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "skeletonDirectory" ] [ "services" "nextcloud" "extraOptions" "skeletondirectory" ])
[ "services" "nextcloud" "skeletonDirectory" ] [ "services" "nextcloud" "settings" "skeletondirectory" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "globalProfiles" ] [ "services" "nextcloud" "extraOptions" "profile.enabled" ])
[ "services" "nextcloud" "globalProfiles" ] [ "services" "nextcloud" "settings" "profile.enabled" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "config" "extraTrustedDomains" ] [ "services" "nextcloud" "extraOptions" "trusted_domains" ])
[ "services" "nextcloud" "config" "extraTrustedDomains" ] [ "services" "nextcloud" "settings" "trusted_domains" ])
(mkRenamedOptionModule
[ "services" "nextcloud" "config" "trustedProxies" ] [ "services" "nextcloud" "extraOptions" "trusted_proxies" ])
[ "services" "nextcloud" "config" "trustedProxies" ] [ "services" "nextcloud" "settings" "trusted_proxies" ])
(mkRenamedOptionModule ["services" "nextcloud" "extraOptions" ] [ "services" "nextcloud" "settings" ])
];
options.services.nextcloud = {
@ -648,7 +649,7 @@ in {
'';
};
extraOptions = mkOption {
settings = mkOption {
type = types.submodule {
freeformType = jsonFormat.type;
options = {
@ -770,7 +771,7 @@ in {
default = null;
description = lib.mdDoc ''
Secret options which will be appended to Nextcloud's config.php file (written as JSON, in the same
form as the [](#opt-services.nextcloud.extraOptions) option), for example
form as the [](#opt-services.nextcloud.settings) option), for example
`{"redis":{"password":"secret"}}`.
'';
};
@ -930,7 +931,7 @@ in {
(i: v: ''
${occ}/bin/nextcloud-occ config:system:set trusted_domains \
${toString i} --value="${toString v}"
'') ([ cfg.hostName ] ++ cfg.extraOptions.trusted_domains));
'') ([ cfg.hostName ] ++ cfg.settings.trusted_domains));
in {
wantedBy = [ "multi-user.target" ];
@ -1056,7 +1057,7 @@ in {
services.nextcloud = {
caching.redis = lib.mkIf cfg.configureRedis true;
extraOptions = mkMerge [({
settings = mkMerge [({
datadirectory = lib.mkDefault "${datadir}/data";
trusted_domains = [ cfg.hostName ];
}) (lib.mkIf cfg.configureRedis {

View File

@ -856,6 +856,7 @@ in {
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-journal-gateway = handleTest ./systemd-journal-gateway.nix {};
systemd-journal-upload = handleTest ./systemd-journal-upload.nix {};
systemd-lock-handler = runTestOn ["aarch64-linux" "x86_64-linux"] ./systemd-lock-handler.nix;
systemd-machinectl = handleTest ./systemd-machinectl.nix {};
systemd-networkd = handleTest ./systemd-networkd.nix {};
systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {};

View File

@ -41,7 +41,7 @@ in {
};
secretFile = "/etc/nextcloud-secrets.json";
extraOptions = {
settings = {
allow_local_remote_servers = true;
redis = {
dbindex = 0;

View File

@ -41,7 +41,7 @@ in {
extraApps = {
inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push;
};
extraOptions.trusted_proxies = [ "::1" ];
settings.trusted_proxies = [ "::1" ];
};
services.redis.servers."nextcloud".enable = true;

View File

@ -0,0 +1,56 @@
{ lib, ... }: {
name = "systemd-lock-handler";
meta.maintainers = with lib.maintainers; [ liff ];
enableOCR = true;
nodes.machine = { config, pkgs, lib, ... }:
let
touch = "${lib.getBin pkgs.coreutils}/bin/touch";
in
{
imports = [ common/wayland-cage.nix ];
services.systemd-lock-handler.enable = true;
systemd.user.services = {
test-lock = {
partOf = [ "lock.target" ];
onSuccess = [ "unlock.target" ];
before = [ "lock.target" ];
wantedBy = [ "lock.target" ];
serviceConfig.ExecStart = "${touch} /tmp/lock.target.activated";
};
test-unlock = {
partOf = [ "unlock.target" ];
after = [ "unlock.target" ];
wantedBy = [ "unlock.target" ];
serviceConfig.ExecStart = "${touch} /tmp/unlock.target.activated";
};
test-sleep = {
partOf = [ "sleep.target" ];
before = [ "sleep.target" ];
wantedBy = [ "sleep.target" ];
serviceConfig.ExecStart = "${touch} /tmp/sleep.target.activated";
};
};
};
testScript = ''
machine.wait_for_unit('graphical.target')
machine.wait_for_text('alice@machine')
machine.send_chars('loginctl lock-session\n')
machine.wait_for_file('/tmp/lock.target.activated')
machine.wait_for_file('/tmp/unlock.target.activated')
machine.send_chars('systemctl suspend\n')
# wait_for_file wont complete before the machine is asleep,
# so well watch the log instead.
machine.wait_for_console_text('Started test-sleep.service.')
# The VM is asleep, regular shutdown wont work.
machine.crash()
'';
}

View File

@ -1,22 +1,22 @@
{
"aci": {
"hash": "sha256-8oQSliSbuSXCXFkwVca33E8g+qUP1Yf9I4n1/c6O8BA=",
"hash": "sha256-1N9Ya8WWb2gL84jYj4B8zllB5jQxRneVSNESYeRhj+c=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
"rev": "v2.12.0",
"rev": "v2.13.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"acme": {
"hash": "sha256-hDZY+AY+MRHNbceVdAzLso9isUo/6/qTCk9hSZLBd2g=",
"hash": "sha256-wyDlI8G1MxZsoYPBjqQ32+/gK8DqQMXZWgTkATaOztQ=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"proxyVendor": true,
"repo": "terraform-provider-acme",
"rev": "v2.19.0",
"rev": "v2.19.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-1OfGAuzd+rLAgLmzzkm3Biru0vb/xd3C5DJQcXwdlME="
"vendorHash": "sha256-PoykgWxMKmQzKUSojFICwjDucukfHYxHdgn60uD+UQ8="
},
"age": {
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@ -28,13 +28,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-GlrHHg3byM18P2YSRoZGsJe+IH1DyYqey18KbkjpYrs=",
"hash": "sha256-7dKlhPGkt1WB/nlXV2IrNT7E3w2kNdishJB/xL299Cw=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.12.1",
"rev": "v4.13.2",
"spdx": "MIT",
"vendorHash": "sha256-S0C5utY/xNs8Jh1vOCFiq/GM/GV/Dt6jJmsnrAAsVSI="
"vendorHash": "sha256-rIyAhe4YQ9XG3nODCSxZRohHgNIPQ94pDLrh7+4Rj1k="
},
"akamai": {
"hash": "sha256-CBBrX0mm6hyobOdhbDaud4HKupIMnDTJp7+kWSej+NI=",
@ -46,11 +46,11 @@
"vendorHash": "sha256-Y30DSv7gAW7JzaTYt0XGwLhTArFILPPnxYmP2mKe9Sc="
},
"alicloud": {
"hash": "sha256-We0Dfqh7qCY2XSQ5Jj+vFtTf2YIsZmCCxufC8vUeoDw=",
"hash": "sha256-LgpEooWXTefhH4HLVO1BIBUXXZBMO11ZS6NwsEbbnog=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.214.1",
"rev": "v1.215.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -64,13 +64,13 @@
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
},
"archive": {
"hash": "sha256-uoHuh4LTbF27ns4oBRfmR7f/NvFd7j0NNmFWywl5x7U=",
"hash": "sha256-jkqbj7NGrTQeMQcg52JVurV3ce8iosxAJjBGdoQ3PLY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/archive",
"owner": "hashicorp",
"repo": "terraform-provider-archive",
"rev": "v2.4.1",
"rev": "v2.4.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-F3bCFX57QTw5h/pnPB6pIrszXYqbwe0kzStOpmPgzHM="
"vendorHash": "sha256-buKYDNVCIcSDLCrCL4ZAKNQ7HqkH3+/7RHjyyR4dLmU="
},
"argocd": {
"hash": "sha256-nJrXbeI/07LlKngEkAnqPG6CiOLFTFugmZMVl2FEvIo=",
@ -82,22 +82,22 @@
"vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo="
},
"artifactory": {
"hash": "sha256-6WtnjsXzGZAIilm3N52G07o7eU9UQ6LXWqd7sDcV2Bg=",
"hash": "sha256-hcdd762uNBYJx2KL4kouR8qWuSZBtGO2egUwaWufOMg=",
"homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
"owner": "jfrog",
"repo": "terraform-provider-artifactory",
"rev": "v10.0.2",
"rev": "v10.1.2",
"spdx": "Apache-2.0",
"vendorHash": "sha256-iYm8xaHDWqjq8ui5bsSMMKNRE0/KBkOkzmImOQwMA7w="
"vendorHash": "sha256-J/+OcqRtcHaqoDkrWIDpPlBHQ/UWupwchA1aeSoHSh4="
},
"auth0": {
"hash": "sha256-z40zGGgKtru83KbmhK5kQhbHdXjCQ7q5G0eAfvqfa4A=",
"hash": "sha256-6VwjKNX24r93EgVED+NK17dY577HL4tT76jSCgVIpHg=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.1.1",
"rev": "v1.1.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-/rT/dVpla6r3pIouZZ7tmluKDyjdYuzdMGoPCNn+Ptk="
"vendorHash": "sha256-t40UZ9LF7PNhIqdEK6puuNeSDapTpC0+BTQgXQlMPTs="
},
"avi": {
"hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=",
@ -109,22 +109,22 @@
"vendorHash": "sha256-r42KHzvRBXuWgLgtg+WUVt0ThjSMXtUKjEE9y/s/1uQ="
},
"aviatrix": {
"hash": "sha256-PRYtkq4CLEbUJ7YOSlvDyz+z4icLi0DBkDCTs/tNoIQ=",
"hash": "sha256-84MtHPrDVaLMQQYnAfuP/pZuzruWxUTLpziwn3ny1oU=",
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
"owner": "AviatrixSystems",
"repo": "terraform-provider-aviatrix",
"rev": "v3.1.3",
"rev": "v3.1.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
"aws": {
"hash": "sha256-wEbpTOlIZjewEepvqTjQRZAY4BtpetMF+HzvmdFEHGw=",
"hash": "sha256-UI1ECQ1bHxwjxtBzpgwbyZLexRH+7L6rjrEcyxSed0g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.31.0",
"rev": "v5.34.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-SVrPxBzcykecphwpHvcAhUbmf77eXC9VDdabGzg2bn8="
"vendorHash": "sha256-sccfJ5EUY9XTjDYah9/0R9L53Zzdfi06kWi5QaFp+og="
},
"azuread": {
"hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=",
@ -136,11 +136,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-0AD30AibmJpfP+5ZT9aQDaeNWyViI9lajq2c4LzEUz4=",
"hash": "sha256-QNaTyyz7H5jf7znPOv6ZTUnaI2zPNHnfZXp2ns3Nv00=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.86.0",
"rev": "v3.89.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -154,13 +154,14 @@
"vendorHash": null
},
"baiducloud": {
"hash": "sha256-YZC3Z9F2SvnUS7yN4blmXy9g4mRr0zPQ9G/yoKa/91g=",
"deleteVendor": true,
"hash": "sha256-+/QLVhVzT80IYwoXvRoxHok3PAw+ZPQhH+b5YARFFLU=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.26",
"rev": "v1.19.31",
"spdx": "MPL-2.0",
"vendorHash": null
"vendorHash": "sha256-7FA5bhb22C/OUhcHrcZK2D4esj+su/HLB7pTyX7ot44="
},
"bigip": {
"hash": "sha256-itRFSpaso9AJpjsXNpVxUgoG13Ys7dSuG5XCcuCkuMk=",
@ -217,31 +218,32 @@
"vendorHash": null
},
"cloudamqp": {
"hash": "sha256-ways6qj4rwoBo0XS69aMIMlBssv4R8CFZ4l5Lsnlih0=",
"hash": "sha256-TWBilEfRrLUk1PIAO/Vq1wed1BTALKApeBGTa5WtN5g=",
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
"owner": "cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.29.1",
"rev": "v1.29.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-+HZzsAsEJuzEZ61ARaNYC1WxI3M6UwFEf+8q3Bd/JWA="
},
"cloudflare": {
"hash": "sha256-X7bjuZQ0UMEmPBQg9U5ZykBViDrcvumsoGCaIegMxP8=",
"hash": "sha256-ftpfjKjW+60n+mmwdx/ivpge4Nt2H1I3ElSk3AhPevY=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.21.0",
"rev": "v4.23.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0Ci2x2yVOU9ChlFJFFObR4DZqe4hX30/ARv+CGDa88k="
"vendorHash": "sha256-F+6bk+Lc0ziRJ/LBhrb5bS8oMN9zT7WqzPZKVUReNU4="
},
"cloudfoundry": {
"hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=",
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
"owner": "cloudfoundry-community",
"proxyVendor": true,
"repo": "terraform-provider-cloudfoundry",
"rev": "v0.51.3",
"rev": "v0.52.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0hq4dR1KqnE2IXMwif2/NVKQKRO/QplW/A6sB4pJ+FM="
"vendorHash": "sha256-g1T6kH8Rv9bpvb6Q3YHCseEi1ayydJIxlplH3k12s8c="
},
"cloudinit": {
"hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=",
@ -290,13 +292,13 @@
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
},
"datadog": {
"hash": "sha256-NEXA4oRPC+A8aDuecp45mQm3NbAQKIHR0GSfxDVkeUw=",
"hash": "sha256-JH0QDASZLFU9beexGze0vg1qrQutgAeGSExwHnYRyKs=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
"rev": "v3.34.0",
"rev": "v3.35.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-57cwm7RqCqDR9PmnBFMnrM2vTogCOlpXwvVwnBkkA0Y="
"vendorHash": "sha256-eGOUtinVIi6R1R19nosw60I+DfdJNxmw3pBrS171tRI="
},
"dexidp": {
"hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=",
@ -345,13 +347,13 @@
"vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA="
},
"dnsimple": {
"hash": "sha256-6QubFsPp3sOmCSgIpRH+x+Q9YDDnOnfX5UzV+iy3uh4=",
"hash": "sha256-iH35dJLa/63s+CU5PdeMbqXUVGfWfpKIXH3znNUApEc=",
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
"owner": "dnsimple",
"repo": "terraform-provider-dnsimple",
"rev": "v1.3.1",
"rev": "v1.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-TTRxLal+oao8UtZpeZ4/HdR99WHGXARZWKqy1baT/mE="
"vendorHash": "sha256-fuIaNHlZica6PxFLzXGA+b6ODWrGWXdWYOeWzgiQRXo="
},
"docker": {
"hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@ -363,13 +365,13 @@
"vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM="
},
"doppler": {
"hash": "sha256-zebkytKTBZ1WRS8oSdW/5B7McnL5GBClN79igdjcMvs=",
"hash": "sha256-YOJbeMFwEF+r4vOdKM5txdqPeYV1/8N/DKwlMjQiT6w=",
"homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler",
"owner": "DopplerHQ",
"repo": "terraform-provider-doppler",
"rev": "v1.3.0",
"rev": "v1.4.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-Z5GKIty78BUFF3VbTcsZKi437gw/kOIHEKkAYu3uB2o="
"vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E="
},
"elasticsearch": {
"hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=",
@ -381,20 +383,20 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
"hash": "sha256-zjYMJfG+FJpgDWdDxlwp02lhs5yn15EIJqrAGIbrgDs=",
"hash": "sha256-WWW4X5fCQAZZiAVi79realf0EtB0AGnfS5yjSJrlZTU=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.22.0",
"rev": "v1.26.0",
"spdx": "MIT",
"vendorHash": "sha256-c40HqNBU0dXsidddgXuke8cSo/frAUKlxWMbsimiYMc="
"vendorHash": "sha256-vMmHoQEXXPbFS/q+wy35SQd5+yEXLQFVWX9AKsmbTn4="
},
"exoscale": {
"hash": "sha256-HVNGzcX0l7E4jB6TiWSPG9XRmpKL6HIt2gaYiDLFOb4=",
"hash": "sha256-SDvW6VC8MwrAWhFGNFMNXA55FbMwSBs9BjX9gnqesZ8=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.54.1",
"rev": "v0.55.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -454,33 +456,33 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-J7jjGlvdxdAfbvSuekVaDTOZbY3MhxvLQMxGFH6LKEQ=",
"hash": "sha256-sk18gC7ZecdvXIzYrNhyYLduttZrVVgekNjgYR379TY=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v16.7.0",
"rev": "v16.8.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+8WUPVpP27wWeWM1DA8P3fOToK791mtO6/grKyxcXg="
"vendorHash": "sha256-dfsIEyLyTTJJxMPXWyo0YuSaRrjL+qGL654TAgECWPM="
},
"google": {
"hash": "sha256-ZlU2ifri8yM6oUwS1tVmHkTbZfdcei7M0aaX8d4o4NE=",
"hash": "sha256-oGd2r/qCpiX/+vLDUlMhBBatZHmX0V+28jkhwy1zga4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v5.11.0",
"rev": "v5.13.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-N/FsxRGQu7GQG54oUO4TYiBFjRSZaU1vxBidC56D7m8="
"vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw="
},
"google-beta": {
"hash": "sha256-VZmoIR4yDh3uaaE9DOt6B04IIxsqla+dFWWXbU2qW1c=",
"hash": "sha256-Q7hQff48vpGoiUPDWF+IuiJYDRMJgajqc7Jzgb4aUj4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v5.11.0",
"rev": "v5.13.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-N/FsxRGQu7GQG54oUO4TYiBFjRSZaU1vxBidC56D7m8="
"vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -492,13 +494,13 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
"hash": "sha256-6A7+9LuKq7XvP65XB00wTKfbY0cXbGR2puVP3qMSVfA=",
"hash": "sha256-hC87cIbDqK9rTK/SOuLy4qBVpMUCPxrFb+ReDkGhU1o=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v2.8.1",
"rev": "v2.10.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-FhpuE01EcxnZALAeMvSBxKmgJRNiJvQg6+WVKCI3Cek="
"vendorHash": "sha256-/cS4skB/p4QMeRqxpgp7JjnkTnTHVtb5M9YEVA1X+k0="
},
"gridscale": {
"hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=",
@ -510,13 +512,13 @@
"vendorHash": null
},
"hcloud": {
"hash": "sha256-9yW3VbxtD+oSxmc2R9yzZisMTAOwjzyCzvZBRdFdH/w=",
"hash": "sha256-D7RBrpOxfSfeip7z+mAkWBjSTVnnM/MfN7Qvl/E+nA0=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.44.1",
"rev": "v1.45.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oGABaZRnwZdS5qPmksT4x7Tin2WpU2Jk9pejeHbghm8="
"vendorHash": "sha256-sipYN9Z76fib4j15VIn/1Rn7QelNNB2+KeFn5rIA6hM="
},
"helm": {
"hash": "sha256-Zj0mZfQhZimk3QozKHNU7quO/SqV3278Y+l9bFa8w/k=",
@ -528,11 +530,11 @@
"vendorHash": "sha256-qoXWnAbjRsvFDtlDCfeaIjc5hZIbCgosyH0pXhHkWiA="
},
"heroku": {
"hash": "sha256-M1HdcKHOVf/rxjECvHqnU6FRXE6T8TpI24Fo0gkZ6FU=",
"hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.2.7",
"rev": "v5.2.8",
"spdx": null,
"vendorHash": null
},
@ -727,13 +729,13 @@
"vendorHash": "sha256-T/YQsNpPISDSVi00KrLRX/+jFNQVl2ze/3D2ZRxmUjI="
},
"lxd": {
"hash": "sha256-2th4/2uLFnmSFKI94bSSt4OSX9wiML/OkThR6SbUCPE=",
"hash": "sha256-culY1Im8D4CtgC2LtTFFB0BgrNgLfDLT0I290+0NE3A=",
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
"owner": "terraform-lxd",
"repo": "terraform-provider-lxd",
"rev": "v1.10.4",
"rev": "v2.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-gcXX4XIyY2X7ZSDMVVzGL/ltaf8Z1/Zx8oJo/IDrIBA="
"vendorHash": "sha256-NHf6xjbbDHsTdjzZ0gIa08PE53Bjv2llBRIgNTx7fj4="
},
"mailgun": {
"hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=",
@ -763,13 +765,13 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"migadu": {
"hash": "sha256-Alr9E9kaShDls8KZzi1OAennXi+T7y4F6AnpMLnhOgM=",
"hash": "sha256-4mT5BbOXl4OY99ao6nyQQgQImPk/1X7lOAZcAxYToQw=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2023.12.21",
"rev": "2024.1.25",
"spdx": "0BSD",
"vendorHash": "sha256-xCra7bh/vydRUAV/g5L8ZbJR3K+UeT8ovz7vMpsupAE="
"vendorHash": "sha256-eee9X1QTDqL9rIGOnnxLU6QlcSIeMLlTZnHYis+ht+w="
},
"minio": {
"hash": "sha256-i3YYBffP7Jp3f0wN1ZwP+c7C8WN8EKUh7JOKzbH0R/I=",
@ -808,13 +810,13 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-dRO12NFsZnRxbKBo7B0wK2C5HHBVA0iIdCU+sYzuSqA=",
"hash": "sha256-9oYJTB4GYnLqw7paELFA8MdhLa5C9+aTCbzHOqrX+Io=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.28.1",
"rev": "v3.29.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-mcw5BfZLmSidhkJz/NonraE77HonthI6WUwRfammM/g="
"vendorHash": "sha256-GwvO9w1WikBseQpGMJXZ4G6E4eyTxrpNWmFWpWGC4Vs="
},
"nomad": {
"hash": "sha256-MEQK/HF9SNEKehLIUMBm2P0WdR5yISJ8DCpI0fVP/DA=",
@ -845,20 +847,20 @@
},
"nutanix": {
"deleteVendor": true,
"hash": "sha256-Okjb4MS28gY1UdYA8+qs45VV5QcGabvMn5bc+nhzbt4=",
"hash": "sha256-p1VhGSor/uxQYiSb9enAeu6dtLRuXMKk9m2DtPEj6vs=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.9.4",
"rev": "v1.9.5",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-s+yyvYJCEcG3BxcPbnHR88WzZfuwk2c4QNGkdqSwLn4=",
"hash": "sha256-WpBYrIm0Holm3ynEZjC7Pkqk8w4jGXu9Q7iOmKN8h/g=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.23.0",
"rev": "v5.26.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -881,13 +883,13 @@
"vendorHash": null
},
"opennebula": {
"hash": "sha256-WVNCZDb96vsDfRvAz0MQlHmQUj+PbJ2CVWJ/A7yOAGk=",
"hash": "sha256-Bz/JKPbdxKS7VDnQoXnZ5ajqh++ujl+4wIS49BDtT94=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
"rev": "v1.3.1",
"rev": "v1.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
"vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU="
},
"openstack": {
"hash": "sha256-sFv7n5tf3aAwe6R1XeJdU3XMDF9ZMCM3t/vVLegZaXM=",
@ -899,13 +901,13 @@
"vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ="
},
"opentelekomcloud": {
"hash": "sha256-KDVbrOwThgZJMD2qmHPhcV+ZbMz3sPM+ZOa4Cw7KEYA=",
"hash": "sha256-4AsU4O5YxyqUvxBPwQw56dPGXoEsHBxJfHc5tnEPz4Q=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.35.15",
"rev": "v1.36.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LWFUVxEF9u6ddVjFVjmzbrcqblKuNurluYlV8/2tn6s="
"vendorHash": "sha256-2XxpNnJkmXFd8CHETUlj1T3eQWDssFqPKzrWAbOOYzk="
},
"opsgenie": {
"hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=",
@ -926,11 +928,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-XP7Y8qCnsCDMfMV1ip09y5HZHZUmpvYzBZA3xodedTw=",
"hash": "sha256-PgMG1TfeJ5vMmp+DxjFKL3UdHpHmPUwF6GG/y36Km+s=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v3.4.0",
"rev": "v3.6.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1034,13 +1036,13 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-KSkVKPRBSdajQrf9XbcVDu+migRWqCKAYxVuywILzEo=",
"hash": "sha256-xJpCu2/7pf6kkZVPhozAXfeU5mbzdVDYT2DvDmjajCc=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.35.0",
"rev": "v2.36.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-vG5wLysF76t4eGIaV8eyrH7TNeZKci2gJ/AfZEUlhdA="
"vendorHash": "sha256-E/qBdcSPq/hpG0b0pmeY6ugItNrtu0HUdlJxpakAVwE="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1061,13 +1063,13 @@
"vendorHash": "sha256-FjJosTjFRJnBW22IB9UHfZe9KWrT1h12InyUl0q7a28="
},
"sentry": {
"hash": "sha256-VTgD19eWeRtDFOuUjnSANkNz8pN/UutJeFgS5qkMpH8=",
"hash": "sha256-sUXOH0cbD5Zf3e4KHLUYM8vu2knJdfIWZ+fq9HMfJ54=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
"rev": "v0.12.1",
"rev": "v0.12.2",
"spdx": "MIT",
"vendorHash": "sha256-lwTsKX3rQObMvysvcPYxJxd09LRlWTH2s+APiOhnalo="
"vendorHash": "sha256-C4gyHcfWN7v5a5gB8CjoDkAlqRxgd6bpsT8n9St2tEM="
},
"shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@ -1079,11 +1081,11 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-ILh5mdTyzU0AfJzyGH9JK1QsOER0BtKn9vXyRaGeb8g=",
"hash": "sha256-kUubyCd00VhB72JEvWDBLF4/uglzkBmijcbotTyQgyA=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v9.0.0",
"rev": "v9.0.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY="
},
@ -1097,11 +1099,11 @@
"vendorHash": null
},
"snowflake": {
"hash": "sha256-G/LHNXkK/pOwNqpoCudM3eGQgv1U2r5l4N/gJfJ5JzU=",
"hash": "sha256-uMXU/0LqOMBRaIOw1hxCdWuogrkWW9r/28YHniOxCbA=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
"rev": "v0.82.0",
"rev": "v0.84.1",
"spdx": "MIT",
"vendorHash": "sha256-nT/zEQgHWnCrlm6TL/DnXIvwDxEs147OfXn/qnlvIH0="
},
@ -1115,13 +1117,13 @@
"vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8="
},
"spotinst": {
"hash": "sha256-LJVaD0GW3a4sDwUuxB8C0Rp+s1wFknMo0LFPDkClp68=",
"hash": "sha256-cLP/I54ClS0aQ14cWrtV57WrDJzBO3fpOMjd9GPR/Z0=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.158.0",
"rev": "v1.160.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-7hgpA6ck7I5r1rkTjJSZ2vbLAe0suS+GaVJ80LlbJsM="
"vendorHash": "sha256-xsV1Co7kSDUrhT6wL6WAzNV/ciHyinW2V6svsezY3/s="
},
"stackpath": {
"hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=",
@ -1142,11 +1144,11 @@
"vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
},
"sumologic": {
"hash": "sha256-HMjghu/2Q7rPkVKO5qtKAqEZFexbK3lfiylwB8Q2sYw=",
"hash": "sha256-LQ+EDvnQVuNhMMAlU27R9aytWsfdyaHHiGLF4zBs4d0=",
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
"owner": "SumoLogic",
"repo": "terraform-provider-sumologic",
"rev": "v2.28.0",
"rev": "v2.28.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI="
},
@ -1169,11 +1171,11 @@
"vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs="
},
"tencentcloud": {
"hash": "sha256-pgG8Y/Bnyg86TNK4pjhBXXLijQE2nCe/Q35L+SY1AJs=",
"hash": "sha256-miYELvWd/b33JUe74j3pYmyDIRrOI+8PEv4mJ+MfhNE=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.64",
"rev": "v1.81.71",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1187,11 +1189,11 @@
"vendorHash": "sha256-lxXTiJeZ/8psry2dxrecB+o0xElSQrCjwZ9zXijI9Bs="
},
"thunder": {
"hash": "sha256-wS50I4iTnHq0rDUoz7tQXpqW84wugQQiw42xhzxFiRw=",
"hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=",
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
"owner": "a10networks",
"repo": "terraform-provider-thunder",
"rev": "v1.3.0",
"rev": "v1.4.1",
"spdx": "BSD-2-Clause",
"vendorHash": null
},
@ -1242,22 +1244,22 @@
"vendorHash": null
},
"utils": {
"hash": "sha256-WbJy1lwEX6RCYxZydCJ+0U/mJB4NoYiUg9+zf8Mxnwk=",
"hash": "sha256-7o3pVJvwnO80bXPJ5i0wfgz9mVqmXJRvGsVWj7N92gA=",
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
"owner": "cloudposse",
"repo": "terraform-provider-utils",
"rev": "1.14.0",
"rev": "1.15.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-vFfwa8DfmiHpbBbXPNovPC7SFoXRjyHRwOVqBcWCEtI="
"vendorHash": "sha256-jz1eQG7pyeYt96KndzY1iR8n5Xm/1NNM7AD5eR8W/k0="
},
"vault": {
"hash": "sha256-Db56SNnIHUuiIUKFKC5NwWaIbfsT85GZ95UBR+PUSMY=",
"hash": "sha256-nFthtHwWuWEgtrw6mhqDlXW5sOuxqHlMyReHvYNcasQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"repo": "terraform-provider-vault",
"rev": "v3.23.0",
"rev": "v3.24.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-5rRWlInDRj7hw4GZqTxfH7Y8tyTvzJgBWA1I5j0EyaI="
"vendorHash": "sha256-SjKFRIrIQD9rsoHkoBxNDdCd8iBF1aHdJodII1ml7Ds="
},
"vcd": {
"hash": "sha256-TP9COMofx4c2GZ0dQkfopn4iq8ddfV3WwuNjTu6yQnU=",
@ -1323,12 +1325,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-piN10vAmUjI/jHTGVWvSGFNR7T01/51E8rJ+UZZt5Vk=",
"hash": "sha256-B0gc1PfAlwq//JvfEx4r+QUBDE1eO4ACJO6H2/TZvz8=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.104.0",
"rev": "v0.106.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-W/i1r+SdYPTU4kha5Pr4i8+Xr8KqTEKFZDA3+vMP8pk="
"vendorHash": "sha256-6GLzXkRrDAsTxdrzz+sWf2AxkTHdyjfu72l4s0KwndY="
}
}

View File

@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "zeek";
version = "6.1.0";
version = "6.1.1";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "sha256-+3VvS5eAl1W13sOJJ8SUd/8GqmR9/NK4gCWxvhtqNY4=";
sha256 = "sha256-j8Vl6Vc/Wu1JpDV0UoXkLcEPUjRUnvwVAq91RPaDN+U=";
};
strictDeps = true;

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
hash = "sha256-GNfFzJsWyu46mP0k1wT8SG22F9oKpLwoLQ0TnNFqvv8=";
hash = "sha256-Gp+Euuuo51syHmQzzQALxZjejYLoJtGJbo4Gl40UASs=";
};
offlineCache = fetchYarnDeps {

View File

@ -2,26 +2,21 @@
lib,
python3Packages,
fetchFromGitHub,
fetchpatch,
}:
python3Packages.buildPythonPackage rec {
python3Packages.buildPythonApplication rec {
pname = "doge";
version = "3.6.0";
version = "3.7.0";
src = fetchFromGitHub {
owner = "Olivia5k";
repo = "doge";
rev = version;
hash = "sha256-72nRghD5k0ofrlvV3hEdyrr6uzV4+8At1bOCmRZTxhk=";
hash = "sha256-LmEbDQUZe/3lg/Ze+WUNyYfC8zMr88/rn10sL0jgbGA=";
};
patches = [
# https://github.com/Olivia5k/doge/pull/66, adds a small doge
(fetchpatch {
url = "https://github.com/Olivia5k/doge/commit/14e3ccc0a3f1e91862492e20a34d008768a34039.patch";
hash = "sha256-3F+7F9RuoiVWoN+69T7tM871AXX1IQbHqFxD+S3TjxQ=";
})
];
pyproject = true;
nativeBuildInputs = [python3Packages.setuptools];
propagatedBuildInputs = [python3Packages.python-dateutil];
meta = {
homepage = "https://github.com/Olivia5k/doge";

View File

@ -0,0 +1,51 @@
{ lib
, fetchFromSourcehut
, buildGoModule
, nix-update-script
, nixosTests
}:
buildGoModule rec {
pname = "systemd-lock-handler";
version = "2.4.2";
src = fetchFromSourcehut {
owner = "~whynothugo";
repo = "systemd-lock-handler";
rev = "v${version}";
hash = "sha256-sTVAabwWtyvHuDp/+8FKNbfej1x/egoa9z1jLIMJuBg=";
};
vendorHash = "sha256-dWzojV3tDA5lLdpAQNC9NaADGyvV7dNOS3x8mfgNNtA=";
passthru = {
updateScript = nix-update-script { };
tests = nixosTests.systemd-lock-handler;
};
# The Makefile expects to find the binary in the source root. Make
# the one built by `buildGoModule` available so that `make install`
# doesnt try to build it again.
postBuild = ''
cp -a $GOPATH/bin/* .
'';
installPhase = ''
runHook preInstall
substituteInPlace systemd-lock-handler.service \
--replace /usr/lib/ $out/lib/
make install DESTDIR= PREFIX=$out
runHook postInstall
'';
meta = with lib; {
homepage = "https://git.sr.ht/~whynothugo/systemd-lock-handler";
description = "Translates systemd-system lock/sleep signals into systemd-user target activations";
license = licenses.isc;
maintainers = with maintainers; [ liff ];
platforms = platforms.linux;
};
}

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xsct";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "faf0";
repo = "sct";
rev = finalAttrs.version;
hash = "sha256-VT92NRz4Te5+8NmpEm1PFXfsL2CoVT+b91/KD9sCg0Q=";
hash = "sha256-PDkbZTtl14wYdfALv43SIU9MKhbfiYlRqkI1mFn1qa4=";
};
buildInputs = [

View File

@ -6,32 +6,48 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
, siosocks
, trustme
}:
buildPythonPackage rec {
pname = "aioftp";
version = "0.21.4";
format = "setuptools";
version = "0.22.2";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
hash = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k=";
hash = "sha256-YcHNpxpldxW0GZRCt9t0XcW+rgWGW43w3QFMBSQK3LA=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov" ""
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
siosocks
];
passthru.optional-dependencies = {
socks = [
siosocks
];
};
nativeCheckInputs = [
async-timeout
pytest-asyncio
pytestCheckHook
trustme
];
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
disabledTests = lib.optionals stdenv.isDarwin [
# uses 127.0.0.2, which macos doesn't like
@ -44,7 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python FTP client/server for asyncio";
homepage = "https://github.com/aio-libs/aioftp";
homepage = "https://aioftp.readthedocs.io/";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};

View File

@ -7,15 +7,20 @@
, nbconvert
, nbformat
, pytestCheckHook
, setuptools
}:
buildPythonPackage rec {
pname = "cirq-ft";
format = "setuptools";
pyproject = true;
inherit (cirq-core) version src meta;
sourceRoot = "${src.name}/${pname}";
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
attrs
cachetools
@ -31,6 +36,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Upstream doesn't always adjust the version
"test_version"
];
# cirq's importlib hook doesn't work here
#pythonImportsCheck = [ "cirq_ft" ];

View File

@ -1,27 +1,23 @@
{ buildPythonPackage
, cirq-core
, freezegun
, google-api-core
, protobuf
, pytestCheckHook
, freezegun
, pythonRelaxDepsHook
, setuptools
}:
buildPythonPackage rec {
pname = "cirq-google";
format = "setuptools";
pyproject = true;
inherit (cirq-core) version src meta;
sourceRoot = "${src.name}/${pname}";
postPatch = ''
substituteInPlace requirements.txt \
--replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \
--replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0"
'';
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
];
propagatedBuildInputs = [
@ -40,6 +36,8 @@ buildPythonPackage rec {
"cirq_google/_version_test.py"
# Trace/BPT trap: 5
"cirq_google/engine/calibration_test.py"
# Very time-consuming
"cirq_google/engine/*_test.py"
];
disabledTests = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "cx-freeze";
version = "6.15.12";
version = "6.15.13";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "cx_Freeze";
inherit version;
hash = "sha256-Ak4OC94xD21daVdsbYSvFxO1YKJcccJ8xoCBk50cWww=";
hash = "sha256-VeOgoVrga9dPJ0W9S3Ye/9Ff5yEOlP2DlDf0sDUh1yo=";
};
nativeBuildInputs = [

View File

@ -1,33 +1,29 @@
{ lib
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, django
, python-fsutil
, fetchFromGitHub
, python
, python-fsutil
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "django-maintenance-mode";
version = "0.19.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fabiocaccamo";
repo = pname;
repo = "django-maintenance-mode";
rev = "refs/tags/${version}";
hash = "sha256-NAm3xMcHePTYxysihYj48bk7r9ykEtPcxPjSEju/zMM=";
};
patches = [
(fetchpatch {
name = "fix-broken-test.patch";
url = "https://github.com/fabiocaccamo/django-maintenance-mode/commit/68cde8d9ceef00eeaa2068f420698c1c562fa9fc.patch";
hash = "sha256-K/zYYkcnmWGc7Knz4l9PgvUtT0IccPRXc3UFriC1ldc=";
})
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
@ -43,11 +39,15 @@ buildPythonPackage rec {
runHook postCheck
'';
pythonImportsCheck = [
"maintenance_mode"
];
meta = with lib; {
description = "Shows a 503 error page when maintenance-mode is on";
homepage = "https://github.com/fabiocaccamo/django-maintenance-mode";
changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${version}";
maintainers = with maintainers; [ mrmebelman ];
license = licenses.bsd3;
maintainers = with maintainers; [ mrmebelman ];
};
}

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "mypy-boto3-builder";
version = "7.21.0";
version = "7.23.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "youtype";
repo = "mypy_boto3_builder";
rev = "refs/tags/${version}";
hash = "sha256-lj9Jkp1AGWIAdGzakpt0BMnmdwe1Uf04PI9sMfEBTbw=";
hash = "sha256-dbf2rHDQSeHEIN31yIm1142Z7AxTZzMf9FGvrWsJblA=";
};
nativeBuildInputs = [

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, imageio
, napari-plugin-engine
, numpy
, pythonOlder
, setuptools-scm
, vispy
@ -10,16 +11,16 @@
buildPythonPackage rec {
pname = "napari-svg";
version = "0.1.6";
format = "setuptools";
version = "0.1.10";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "napari";
repo = pname;
repo = "napari-svg";
rev = "refs/tags/v${version}";
hash = "sha256-lvI6RWT9oUE95vL6WO75CASc/Z+1G5UMm2p8vhqIjA0=";
hash = "sha256-ywN9lUwBFW8zP7ivP7MNTYFbTCcmaZxAuKr056uY68Q=";
};
nativeBuildInputs = [
@ -27,9 +28,10 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
vispy
napari-plugin-engine
imageio
napari-plugin-engine
numpy
vispy
];
# Circular dependency: napari
@ -38,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A plugin for writing svg files from napari";
homepage = "https://github.com/napari/napari-svg";
changelog = "https://github.com/napari/napari-svg/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ SomeoneSerge ];
};

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "niaarm";
version = "0.3.5";
version = "0.3.6";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = "NiaARM";
rev = "refs/tags/${version}";
hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les=";
hash = "sha256-DOTeo5ZPZQR56E78pAKQ3DXarIUHhxXoZu0fISDr6fw=";
};
nativeBuildInputs = [

View File

@ -4,22 +4,27 @@
, pytestCheckHook
, pythonOlder
, requests
, setuptools
}:
buildPythonPackage rec {
pname = "python-fsutil";
version = "0.13.0";
format = "setuptools";
version = "0.13.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fabiocaccamo";
repo = pname;
repo = "python-fsutil";
rev = "refs/tags/${version}";
hash = "sha256-RbpbFd+GqFPl88FqKvYEE6HcwFRzPDUTs3vMYM6x7es=";
hash = "sha256-yY8hhw6uNKqrcj0geoQeGN/JCDJVja7pCPUHwoViL64=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
requests
];

View File

@ -6,7 +6,7 @@
, httpx
, iso8601
, poetry-core
, pydantic
, pydantic_1
, pyjwt
, pytest-asyncio
, pytestCheckHook
@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.23.1";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
@ -46,6 +46,7 @@ buildPythonPackage rec {
pythonRelaxDeps = [
"attrs"
"httpx"
"iso8601"
];
nativeBuildInputs = [
@ -57,7 +58,7 @@ buildPythonPackage rec {
attrs
httpx
iso8601
pydantic
pydantic_1
pyjwt
python-dateutil
retrying

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.20.2";
version = "0.20.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-XimYakrTlorD2CyqhdZo08ZiJMnueL4/5kvOMNrnt5g=";
hash = "sha256-BqhZGJoynKjmbVbO7vI5FIjjm4ePvSFB8RXqtNQW/iI=";
};
nativeBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.31.0.20240106";
version = "2.31.0.20240125";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-DhxzHBfzNhjsWOAithShouzCX33IaACzbvNBOAQCxhI=";
hash = "sha256-A6KM4dfNVBmRSOBDsgec3e0i1nldGaLCpnkaSyteLrU=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.29658";
version = "0.1.29936";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zubYAeVYddFC6J7kCjTlhNciy/X95yzEq2UyRWi2Jh8=";
sha256 = "sha256-PJy2kg727ZEsEbQzR5EE8SeYfM1ZqaIbS2FZxewn5J0=";
};
vendorHash = "sha256-mDpuoKOW2/PexZ/yJeQ2yzCjoKfD23J36pZ5BPDo/mg=";

View File

@ -36,7 +36,7 @@ let
homepage = "https://nextcloud.com";
maintainers = with maintainers; [ schneefux bachp globin ma27 ];
license = licenses.agpl3Plus;
platforms = with platforms; unix;
platforms = platforms.linux;
knownVulnerabilities = extraVulnerabilities
++ (optional eol "Nextcloud version ${version} is EOL");
};

View File

@ -36,9 +36,11 @@ rustPlatform.buildRustPackage rec {
};
meta = with lib; {
changelog = "https://github.com/nextcloud/notify_push/releases/tag/v${version}";
description = "Update notifications for nextcloud clients";
homepage = "https://github.com/nextcloud/notify_push";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = teams.helsinki-systems.members;
};
}

View File

@ -7,12 +7,12 @@
, stdenv
}:
let
version = "23.3.2";
version = "23.3.4";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-TRcTiwAK0epmQkV0pwAV1S1jXr0VCq9lZQkANjSToko=";
sha256 = "sha256-Bcr+bMqurwpd7IFTBR73RcgekkiuQQ3JPjvrp03fpJ0=";
};
server = callPackage ./server.nix { inherit src version; };
in

View File

@ -0,0 +1,52 @@
{ lib
, stdenv
, curl
, fetchFromGitHub
, lz4
, postgresql
}:
stdenv.mkDerivation rec {
pname = "citus";
version = "12.1.0";
src = fetchFromGitHub {
owner = "citusdata";
repo = "citus";
rev = "v${version}";
hash = "sha256-ypuinDOHvgjRdbnTTFBpALy6rIR3rrP00JDvlHtmCTk=";
};
buildInputs = [
curl
lz4
postgresql
];
installPhase = ''
runHook preInstall
install -D -t $out/lib src/backend/columnar/citus_columnar${postgresql.dlSuffix}
install -D -t $out/share/postgresql/extension src/backend/columnar/build/sql/*.sql
install -D -t $out/share/postgresql/extension src/backend/columnar/*.control
install -D -t $out/lib src/backend/distributed/citus${postgresql.dlSuffix}
install -D -t $out/share/postgresql/extension src/backend/distributed/build/sql/*.sql
install -D -t $out/share/postgresql/extension src/backend/distributed/*.control
runHook postInstall
'';
meta = with lib; {
# "Our soft policy for Postgres version compatibilty is to support Citus'
# latest release with Postgres' 3 latest releases."
# https://www.citusdata.com/updates/v12-0/#deprecated_features
broken = versionOlder postgresql.version "14";
description = "Distributed PostgreSQL as an extension";
homepage = "https://www.citusdata.com/";
changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";
license = licenses.agpl3Only;
maintainers = with maintainers; [ marsam ];
inherit (postgresql.meta) platforms;
};
}

View File

@ -4,6 +4,8 @@ self: super: {
apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { };
citus = super.callPackage ./ext/citus.nix { };
h3-pg = super.callPackage ./ext/h3-pg.nix { };
hypopg = super.callPackage ./ext/hypopg.nix { };

View File

@ -21,12 +21,12 @@ let
owner = "DataDog";
repo = "datadog-agent";
goPackagePath = "github.com/${owner}/${repo}";
version = "7.50.1";
version = "7.50.3";
src = fetchFromGitHub {
inherit owner repo;
rev = version;
hash = "sha256-03+ofnS8ecx2SRAWb0KX6TxRd0SDEOCd4+EBVgoMFZk=";
hash = "sha256-AN5BruLPyrpIGSUkcYkZC0VgItk9NHiZTXstv6j9TlY=";
};
rtloader = stdenv.mkDerivation {
pname = "datadog-agent-rtloader";
@ -43,7 +43,7 @@ in buildGoModule rec {
doCheck = false;
vendorHash = "sha256-X+QLz45kWg12ls1dkGzThbNxPw7WEJ1odRYkuhOyhk8=";
vendorHash = "sha256-Rn8EB/6FHQk9COlOaxm4TQXjGCIPZHJV2QQnPDcbRnM=";
subPackages = [
"cmd/agent"

View File

@ -3,16 +3,21 @@
python3Packages.buildPythonApplication rec {
pname = "ytcc";
version = "2.6.1";
format = "pyproject";
pyproject = true;
src = fetchFromGitHub {
owner = "woefe";
repo = "ytcc";
rev = "v${version}";
sha256 = "sha256-pC2uoog+nev/Xa6UbXX4vX00VQQLHtZzbVkxrxO/Pg8=";
hash = "sha256-pC2uoog+nev/Xa6UbXX4vX00VQQLHtZzbVkxrxO/Pg8=";
};
nativeBuildInputs = [ gettext installShellFiles ];
nativeBuildInputs = [
gettext
installShellFiles
] ++ (with python3Packages; [
setuptools
]);
propagatedBuildInputs = with python3Packages; [
yt-dlp
@ -20,7 +25,9 @@ python3Packages.buildPythonApplication rec {
wcwidth
];
nativeCheckInputs = with python3Packages; [ nose pytestCheckHook ];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
];
# Disable tests that touch network or shell out to commands
disabledTests = [

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "govulncheck";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "golang";
repo = "vuln";
rev = "refs/tags/v${version}";
hash = "sha256-vTHP7I3r7EAt4puh7bonKj6A94j169tKWgTfxASWyo0=";
hash = "sha256-1x2hj4HD3KAo9w1QXh5qsWtcAM0Kly5u/DRd13Mqa5w=";
};
patches = [

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.48"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.53"

View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 261eca342915db81d67cdfe7f2ef7b3788fd508f
ref: refs/tags/6.3.48
revision: 45efd21e748da75cc37d999dbfa3ec6c4fc4d0e9
ref: refs/tags/6.3.53
specs:
metasploit-framework (6.3.48)
metasploit-framework (6.3.53)
actionpack (~> 7.0.0)
activerecord (~> 7.0.0)
activesupport (~> 7.0.0)
@ -35,7 +35,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.161)
metasploit-payloads (= 2.0.165)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.26)
mqtt
@ -62,6 +62,7 @@ GIT
rb-readline
recog
redcarpet
reline
rex-arch
rex-bin_tools
rex-core
@ -253,7 +254,7 @@ GEM
activemodel (~> 7.0)
activesupport (~> 7.0)
railties (~> 7.0)
metasploit-payloads (2.0.161)
metasploit-payloads (2.0.165)
metasploit_data_models (6.0.3)
activerecord (~> 7.0)
activesupport (~> 7.0)
@ -463,4 +464,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
2.4.13
2.5.3

View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.48";
version = "6.3.53";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = "refs/tags/${version}";
hash = "sha256-AY0k44/gYXP4h3SoRVF9aK2L2skZ03Azd5V9hSRDoHQ=";
hash = "sha256-LyI5Ne2ztO0Or1btT0jG96PYNZVMTwEZNwYCEIc6Rd4=";
};
nativeBuildInputs = [

View File

@ -664,12 +664,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "261eca342915db81d67cdfe7f2ef7b3788fd508f";
sha256 = "0x508cj8azcmfwrp1lqrr7d8pbb8gm8lba3lhzw76qg0izij9381";
rev = "45efd21e748da75cc37d999dbfa3ec6c4fc4d0e9";
sha256 = "1pj57a3i00h66wch2kscjlsxi8zpqr44zvanmw7fvd5kxlskj8ig";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.48";
version = "6.3.53";
};
metasploit-model = {
groups = ["default"];
@ -686,10 +686,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1naxfj3jcr5gfsr5lbkis9ww2mw6c2i97k1zdidajpr91dyj2314";
sha256 = "0v9vr3iklxm53vfkyiqja8a942n8r0a49w9rmvk9ql4h3r5xcgpw";
type = "gem";
};
version = "2.0.161";
version = "2.0.165";
};
metasploit_data_models = {
groups = ["default"];

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.64.0";
version = "3.65.0";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-juacw+Y6gmEsmBtW3gDJQiQjjxh15Sr23dYoR7PuVTU=";
hash = "sha256-v2RhyXwjCvlhbfFiTuURatEq5foylatGOdqQCYQbZAE=";
};
vendorHash = "sha256-qmU04k+gzn1A+Zq4GlZubud2g7Vs9uiWYiG6xWCBMVw=";
vendorHash = "sha256-yhgNsiKh0sgVn0N1LqpWT1Utapc5DL+Ueposg+bAO5o=";
ldflags = [
"-s"