Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-06-12 00:02:14 +00:00 committed by GitHub
commit dea522a1e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 952 additions and 691 deletions

View file

@ -6709,6 +6709,13 @@
githubId = 8211181;
name = "Kevin Kandlbinder";
};
kfears = {
email = "kfearsoff@gmail.com";
github = "KFearsoff";
githubId = 66781795;
matrix = "@kfears:matrix.org";
name = "KFears";
};
kfollesdal = {
email = "kfollesdal@gmail.com";
github = "kfollesdal";

View file

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;
{
@ -23,6 +23,12 @@ with lib;
"/share/pixmaps"
];
environment.systemPackages = [
# Empty icon theme that contains index.theme file describing directories
# where toolkits should look for icons installed by apps.
pkgs.hicolor-icon-theme
];
# libXcursor looks for cursors in XCURSOR_PATH
# it mostly follows the spec for icons
# See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes

View file

@ -197,6 +197,7 @@
./programs/npm.nix
./programs/noisetorch.nix
./programs/oblogout.nix
./programs/openvpn3.nix
./programs/pantheon-tweaks.nix
./programs/partition-manager.nix
./programs/plotinus.nix

View file

@ -0,0 +1,33 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.openvpn3;
in
{
options.programs.openvpn3 = {
enable = mkEnableOption "the openvpn3 client";
};
config = mkIf cfg.enable {
services.dbus.packages = with pkgs; [
openvpn3
];
users.users.openvpn = {
isSystemUser = true;
uid = config.ids.uids.openvpn;
group = "openvpn";
};
users.groups.openvpn = {
gid = config.ids.gids.openvpn;
};
environment.systemPackages = with pkgs; [
openvpn3
];
};
}

View file

@ -189,7 +189,6 @@ in
Note that this should be a last resort; patching the package is preferred (see GPaste).
'';
apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ];
};
favoriteAppsOverride = mkOption {
@ -367,6 +366,10 @@ in
services.upower.enable = config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
# Explicitly enabled since GNOME will be severely broken without these.
xdg.mime.enable = true;
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = [
pkgs.xdg-desktop-portal-gnome
@ -400,6 +403,18 @@ in
})
(mkIf serviceCfg.core-shell.enable {
services.xserver.desktopManager.gnome.sessionPath =
let
mandatoryPackages = [
pkgs.gnome.gnome-shell
];
optionalPackages = [
pkgs.gnome.gnome-shell-extensions
];
in
mandatoryPackages
++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
services.colord.enable = mkDefault true;
services.gnome.chrome-gnome-shell.enable = mkDefault true;
services.gnome.glib-networking.enable = true;
@ -452,26 +467,31 @@ in
];
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome; [
adwaita-icon-theme
nixos-background-info
gnome-backgrounds
gnome-bluetooth
gnome-color-manager
gnome-control-center
gnome-shell
gnome-shell-extensions
gnome-themes-extra
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs
pkgs.orca
pkgs.glib # for gsettings
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch
pkgs.hicolor-icon-theme
pkgs.shared-mime-info # for update-mime-database
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
];
environment.systemPackages =
let
mandatoryPackages = with pkgs.gnome; [
gnome-shell
];
optionalPackages = with pkgs.gnome; [
adwaita-icon-theme
nixos-background-info
gnome-backgrounds
gnome-bluetooth
gnome-color-manager
gnome-control-center
gnome-shell-extensions
gnome-themes-extra
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs
pkgs.orca
pkgs.glib # for gsettings program
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch program
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
];
in
mandatoryPackages
++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
})
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst

View file

@ -51,6 +51,11 @@ in {
imports = [
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
This option corresponds to `refresh-rate`, which has been unused
since picom v6 and was subsequently removed by upstream.
See https://github.com/yshui/picom/commit/bcbc410
'')
];
options.services.picom = {
@ -235,15 +240,6 @@ in {
'';
};
refreshRate = mkOption {
type = types.ints.unsigned;
default = 0;
example = 60;
description = ''
Screen refresh rate (0 = automatically detect).
'';
};
settings = with types;
let
scalar = oneOf [ bool int float str ]
@ -306,7 +302,6 @@ in {
# other options
backend = cfg.backend;
vsync = cfg.vSync;
refresh-rate = cfg.refreshRate;
};
systemd.user.services.picom = {

View file

@ -139,7 +139,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
peer0.wait_for_unit("network-online.target")
peer1.wait_for_unit("3proxy.service")
peer1.wait_for_open_port("9999")
peer1.wait_for_open_port(9999)
# test none auth
peer0.succeed(
@ -153,7 +153,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
)
peer2.wait_for_unit("3proxy.service")
peer2.wait_for_open_port("9999")
peer2.wait_for_open_port(9999)
# test iponly auth
peer0.succeed(
@ -167,7 +167,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
)
peer3.wait_for_unit("3proxy.service")
peer3.wait_for_open_port("9999")
peer3.wait_for_open_port(9999)
# test strong auth
peer0.succeed(

View file

@ -20,7 +20,7 @@ in
testScript = ''
machine.wait_for_unit("bazarr.service")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("curl --fail http://localhost:${toString port}/")
'';
})

View file

@ -61,7 +61,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
''
url = "http://localhost/example.html"
webserver.wait_for_unit("caddy")
webserver.wait_for_open_port("80")
webserver.wait_for_open_port(80)
def check_etag(url):
@ -95,13 +95,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
webserver.succeed(
"${justReloadSystem}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port("8080")
webserver.wait_for_open_port(8080)
with subtest("multiple configs are correctly merged"):
webserver.succeed(
"${multipleConfigs}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port("8080")
webserver.wait_for_open_port("8081")
webserver.wait_for_open_port(8080)
webserver.wait_for_open_port(8081)
'';
})

View file

@ -23,7 +23,7 @@ in
testScript = ''
machine.wait_for_unit("convos")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'")
machine.succeed("curl -f http://localhost:${toString port}/")
'';

View file

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("cryptpad.service")
machine.wait_for_open_port("3000")
machine.wait_for_open_port(3000)
machine.succeed("curl -L --fail http://localhost:3000/sheet")
'';
})

View file

@ -47,7 +47,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
simple.wait_for_unit("deluged")
simple.wait_for_unit("delugeweb")
simple.wait_for_open_port("8112")
simple.wait_for_open_port(8112)
declarative.wait_for_unit("network.target")
declarative.wait_until_succeeds("curl --fail http://simple:8112")

View file

@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
registry.start()
registry.wait_for_unit("docker-registry.service")
registry.wait_for_open_port("8080")
registry.wait_for_open_port(8080)
client1.succeed("docker push registry:8080/scratch")
client2.start()

View file

@ -24,6 +24,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
node0.wait_for_unit("freeswitch.service")
# Wait for SIP port to be open
node0.wait_for_open_port("5060")
node0.wait_for_open_port(5060)
'';
})

View file

@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
start_all()
agent.wait_for_unit("gocd-server")
agent.wait_for_open_port("8153")
agent.wait_for_open_port(8153)
agent.wait_for_unit("gocd-agent")
agent.wait_until_succeeds(
"curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid"

View file

@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
''
machine.wait_for_unit("isso.service")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("curl --fail http://localhost:${toString port}/?uri")
machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js")

View file

@ -14,7 +14,7 @@ with lib;
testScript = ''
machine.wait_for_unit("libreddit.service")
machine.wait_for_open_port("80")
machine.wait_for_open_port(80)
# Query a page that does not require Internet access
machine.succeed("curl --fail http://localhost:80/settings")
'';

View file

@ -14,7 +14,7 @@ with lib;
start_all()
machine.wait_for_unit("lidarr.service")
machine.wait_for_open_port("8686")
machine.wait_for_open_port(8686)
machine.succeed("curl --fail http://localhost:8686/")
'';
})

View file

@ -24,7 +24,7 @@ import ./make-test-python.nix ({ lib, ... }:
start_all()
machine.wait_for_unit("mailcatcher.service")
machine.wait_for_open_port("1025")
machine.wait_for_open_port(1025)
machine.succeed(
'echo "this is the body of the email" | mail -s "subject" root@example.org'
)

View file

@ -12,8 +12,8 @@ import ./make-test-python.nix ({ lib, ... }: {
start_all()
machine.wait_for_unit("mailhog.service")
machine.wait_for_open_port("1025")
machine.wait_for_open_port("8025")
machine.wait_for_open_port(1025)
machine.wait_for_open_port(8025)
machine.succeed(
'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
)

View file

@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
start_all()
machine.wait_for_unit("meilisearch")
machine.wait_for_open_port("7700")
machine.wait_for_open_port(7700)
with subtest("check version"):
version = json.loads(machine.succeed("curl ${apiUrl}/version"))

View file

@ -32,7 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff")
server.wait_for_unit("minidlna")
server.wait_for_open_port("8200")
server.wait_for_open_port(8200)
# requests must be made *by IP* to avoid triggering minidlna's
# DNS-rebinding protection
server.succeed("curl --fail http://$(getent ahostsv4 localhost | head -n1 | cut -f 1 -d ' '):8200/")

View file

@ -7,6 +7,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
machine.wait_for_unit("navidrome")
machine.wait_for_open_port("4533")
machine.wait_for_open_port(4533)
'';
})

View file

@ -73,14 +73,14 @@ in
with subtest("DNSKEY bit record is present"):
server.wait_for_unit("pdns-recursor")
server.wait_for_open_port("53")
server.wait_for_open_port(53)
server.succeed("host -t DNSKEY bit")
'') +
''
with subtest("can resolve a .bit name"):
server.wait_for_unit("namecoind")
server.wait_for_unit("ncdns")
server.wait_for_open_port("8332")
server.wait_for_open_port(8332)
assert "1.2.3.4" in server.succeed("dig @localhost -p 5333 test.bit")
with subtest("SOA record has identity information"):

View file

@ -54,8 +54,8 @@ in
testScript = ''
start_all()
webserver.wait_for_open_port("80")
proxy.wait_for_open_port("80")
webserver.wait_for_open_port(80)
proxy.wait_for_open_port(80)
client.wait_until_succeeds("curl -s --fail http://proxy/hello-world.txt")
'';
})

View file

@ -19,7 +19,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
start_all()
nodered.wait_for_unit("node-red.service")
nodered.wait_for_open_port("1880")
nodered.wait_for_open_port(1880)
client.wait_for_unit("multi-user.target")

View file

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("ombi.service")
machine.wait_for_open_port("5000")
machine.wait_for_open_port(5000)
machine.succeed("curl --fail http://localhost:5000/")
'';
})

View file

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
server.wait_for_unit("pdns-recursor")
server.wait_for_open_port("53")
server.wait_for_open_port(53)
assert "192.0.2.1" in server.succeed("host example.com localhost")
'';
})

View file

@ -12,6 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
start_all()
machine.wait_for_unit("pict-rs")
machine.wait_for_open_port("8080")
machine.wait_for_open_port(8080)
'';
})

View file

@ -15,7 +15,7 @@ import ./make-test-python.nix ({ lib, ... }: {
machine.wait_for_unit("plikd")
# Network test
machine.wait_for_open_port("8080")
machine.wait_for_open_port(8080)
machine.succeed("curl --fail -v http://localhost:8080")
# Application test

View file

@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
default.wait_for_unit("podgrab")
default.wait_for_open_port("${toString defaultPort}")
default.wait_for_open_port(defaultPort)
default.succeed("curl --fail http://localhost:${toString defaultPort}")
customized.wait_for_unit("podgrab")
customized.wait_for_open_port("${toString customPort}")
customized.wait_for_open_port(customPort)
customized.succeed("curl --fail http://localhost:${toString customPort}")
'';

View file

@ -81,23 +81,23 @@ in
''
with subtest("Privoxy is running"):
machine.wait_for_unit("privoxy")
machine.wait_for_open_port("8118")
machine.wait_for_open_port(8118)
machine.succeed("curl -f http://config.privoxy.org")
with subtest("Privoxy can filter http requests"):
machine.wait_for_open_port("80")
machine.wait_for_open_port(80)
assert "great day" in machine.succeed(
"curl -sfL http://example.com/how-are-you? | tee /dev/stderr"
)
with subtest("Privoxy can filter https requests"):
machine.wait_for_open_port("443")
machine.wait_for_open_port(443)
assert "great day" in machine.succeed(
"curl -sfL https://example.com/how-are-you? | tee /dev/stderr"
)
with subtest("Blocks are working"):
machine.wait_for_open_port("443")
machine.wait_for_open_port(443)
machine.fail("curl -f https://example.com/ads 1>&2")
machine.succeed("curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2")

View file

@ -52,7 +52,7 @@ let
* testScript = ''
* <exporterName>.start()
* <exporterName>.wait_for_unit("prometheus-<exporterName>-exporter.service")
* <exporterName>.wait_for_open_port("1234")
* <exporterName>.wait_for_open_port(1234)
* <exporterName>.succeed("curl -sSf 'localhost:1234/metrics'")
* <exporterName>.shutdown()
* '';

View file

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("prowlarr.service")
machine.wait_for_open_port("9696")
machine.wait_for_open_port(9696)
machine.succeed("curl --fail http://localhost:9696/")
'';
})

View file

@ -22,6 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_until_succeeds(
'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"'
)
machine.wait_for_open_port("15672")
machine.wait_for_open_port(15672)
'';
})

View file

@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
machine.wait_for_unit("redis-test")
# The unnamed Redis server still opens a port for backward-compatibility
machine.wait_for_open_port("6379")
machine.wait_for_open_port(6379)
machine.wait_for_file("${redis.servers."".unixSocket}")
machine.wait_for_file("${redis.servers."test".unixSocket}")

View file

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("sonarr.service")
machine.wait_for_open_port("8989")
machine.wait_for_open_port(8989)
machine.succeed("curl --fail http://localhost:8989/")
'';
})

View file

@ -72,9 +72,9 @@ in
nodes = { inherit minimal; };
testScript = ''
minimal.wait_for_open_port("3025")
minimal.wait_for_open_port("3080")
minimal.wait_for_open_port("3022")
minimal.wait_for_open_port(3025)
minimal.wait_for_open_port(3080)
minimal.wait_for_open_port(3022)
'';
};
@ -86,12 +86,12 @@ in
testScript = ''
with subtest("teleport ready"):
server.wait_for_open_port("3025")
client.wait_for_open_port("3022")
server.wait_for_open_port(3025)
client.wait_for_open_port(3022)
with subtest("check applied configuration"):
server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'")
server.wait_for_open_port("3000")
server.wait_for_open_port(3000)
client.succeed("journalctl -u teleport.service --grep='DEBU'")
server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'")
'';

View file

@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
client.start()
server.wait_for_unit("vsftpd")
server.wait_for_open_port("21")
server.wait_for_open_port(21)
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server")
client.succeed('echo "this is a test" > /tmp/test.file.up')

View file

@ -7,25 +7,25 @@
buildGoModule rec {
pname = "lndhub-go";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "getAlby";
repo = "lndhub.go";
rev = "${version}";
sha256 = "sha256-CQVHU3gIIiucrz9TA2ltPNmj6d22vbraktBoyTHTQ1k=";
sha256 = "sha256-n/mbTd2gc6+R2prt67uHKxFyFXoFaJ/T+cB7pbVYR+0=";
};
patches = [
# fix inconsistent vendoring
# https://github.com/getAlby/lndhub.go/pull/184
# https://github.com/getAlby/lndhub.go/pull/190
(fetchpatch {
url = "https://github.com/getAlby/lndhub.go/commit/2ee7ace9385f8626eb15cbf653ccd46423b5a9c5.patch";
sha256 = "sha256-1ESPlCTzpFbqshzS6xF4apY8Doz9GvEbZe93Z93P9EI=";
url = "https://github.com/getAlby/lndhub.go/commit/3bf7149b3b45c4c4a979effee7e166b304342765.patch";
sha256 = "sha256-fplDqEv+P3KKs6rSvw04sOp3bBnwuyDWSonKyyDWvlM=";
})
];
vendorSha256 = "sha256-bp5q8K7OpvNo28jojaPPj53hUe+me4oLwDBkgZk+0Ec=";
vendorSha256 = "sha256-KD2/H0nG6Lg590mdaZ8Zm4+ggZcw6yKrITEJLk4BWAU=";
doCheck = false; # tests require networking

View file

@ -35,6 +35,8 @@
, vulkan-loader
, wayland
, wayland-protocols
, wayland-scanner
, libdrm
, zlib
# Set as 'false' to build monado without service support, i.e. allow VR
# applications linking against libopenxr_monado.so to use OpenXR standalone
@ -65,6 +67,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}"
"-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON"
];
buildInputs = [
@ -95,7 +98,9 @@ stdenv.mkDerivation rec {
vulkan-headers
vulkan-loader
wayland
wayland-scanner
wayland-protocols
libdrm
zlib
];

View file

@ -39,10 +39,10 @@
"owner": "akamai",
"provider-source-address": "registry.terraform.io/akamai/akamai",
"repo": "terraform-provider-akamai",
"rev": "v2.1.0",
"sha256": "sha256-BxdoHSylItn8AmZJf+mUJ7joSTyFumdnSBtLKXWZbBw=",
"vendorSha256": "sha256-0euOl3ttt1dDURIti0UsXKqfZiSVYE2nxkFlQ3gLlsM=",
"version": "2.1.0"
"rev": "v2.1.1",
"sha256": "sha256-bS7VUpNs7W5atWWfEWf7rqlc5WD90R7fDNuiqMw+rlI=",
"vendorSha256": "sha256-/ADWK5h6zgxQ8R8uvZwGywnU8NoSqkrjLEh5fjbx43c=",
"version": "2.1.1"
},
"alicloud": {
"deleteVendor": true,
@ -59,8 +59,8 @@
"provider-source-address": "registry.terraform.io/nbering/ansible",
"repo": "terraform-provider-ansible",
"rev": "v1.0.4",
"sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y",
"vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq",
"sha256": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
"vendorSha256": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=",
"version": "1.0.4"
},
"archive": {
@ -68,7 +68,7 @@
"provider-source-address": "registry.terraform.io/hashicorp/archive",
"repo": "terraform-provider-archive",
"rev": "v2.2.0",
"sha256": "11iv6c0bnrp2s69h3b7f238jdnkcjgrihp8c46lhw393ki6aqfhk",
"sha256": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=",
"vendorSha256": null,
"version": "2.2.0"
},
@ -94,44 +94,44 @@
"owner": "AviatrixSystems",
"provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
"repo": "terraform-provider-aviatrix",
"rev": "v2.22.0",
"sha256": "sha256-ZJs9XtoftMihY9VwWw0lPxH2Nu6NmcEcchsRg71os0c=",
"rev": "v2.22.1",
"sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=",
"vendorSha256": null,
"version": "2.22.0"
"version": "2.22.1"
},
"aws": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.17.1",
"sha256": "sha256-2AabKctIYtb20K5APY54syI7BhaE8WSBRg3BAvtBV+w=",
"vendorSha256": "sha256-qfVUJ3NqDRzISk2UTVPD9Xe/GIZASzSqP5P1sJJHvOo=",
"version": "4.17.1"
"rev": "v4.18.0",
"sha256": "sha256-hiC0SwLQk2DaVOTs3ZV+VngN0QFcN/oJPkvdMbQzzlg=",
"vendorSha256": "sha256-ZTUPO867RuX9s33X3qsetRXQ8C1bfHFE1UYQIkK2KRo=",
"version": "4.18.0"
},
"azuread": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
"repo": "terraform-provider-azuread",
"rev": "v2.22.0",
"sha256": "sha256-x3SRTGCokEZGoG2l46PSelI8+FkHp5sbDdd14Iyei54=",
"rev": "v2.23.0",
"sha256": "sha256-qHlC5BQnO8MusjTkbMcNp1yqm//nR4lL3BgsG584q38=",
"vendorSha256": null,
"version": "2.22.0"
"version": "2.23.0"
},
"azurerm": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.9.0",
"sha256": "sha256-bhBq3fZ3xTvfyvfzpveDqNkbwP4lc78TfR1JOa8HYrc=",
"rev": "v3.10.0",
"sha256": "sha256-2xRSHKHC8ypleatXt6cYtZtDMxCSlcDh5lfNmyBb3/4=",
"vendorSha256": null,
"version": "3.9.0"
"version": "3.10.0"
},
"azurestack": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurestack",
"repo": "terraform-provider-azurestack",
"rev": "v0.10.0",
"sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8",
"sha256": "sha256-iJUWZMN4XxK6ATwoXyXnYxqdY7YCcwOmjTbQYc3NnFE=",
"vendorSha256": null,
"version": "0.10.0"
},
@ -214,7 +214,7 @@
"provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa",
"repo": "terraform-provider-ciscoasa",
"rev": "v1.3.0",
"sha256": "0a7k9pvx4vfap484jyxxjba3a3n28pssnnjiwzlc7n1ja7h3hdy7",
"sha256": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
"vendorSha256": null,
"version": "1.3.0"
},
@ -222,10 +222,10 @@
"owner": "cloudamqp",
"provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.17.2",
"sha256": "sha256-/17CEejRGgLAJfAt4bOijpNVZhR2Tt9sXxBcfcC8EDQ=",
"vendorSha256": "sha256-tPYbkQz7he5V5+z3Swt9ch9Sdr1xqgbpDHasd4xB1B8=",
"version": "1.17.2"
"rev": "v1.18.0",
"sha256": "sha256-mtrJUlN8flPttli9Q4ZBAM/yPDolYMjEP8u22B6TZL4=",
"vendorSha256": "sha256-cDf2nSTrX8T+vfRVthoBV7m+HtLo9cYt32uSirWor48=",
"version": "1.18.0"
},
"cloudflare": {
"owner": "cloudflare",
@ -250,7 +250,7 @@
"provider-source-address": "registry.terraform.io/hashicorp/cloudinit",
"repo": "terraform-provider-cloudinit",
"rev": "v2.2.0",
"sha256": "0yv52hz60whmqfwv2a6f9f1fpszcyzs78hhz3lq4imz9dv5bd29z",
"sha256": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=",
"vendorSha256": null,
"version": "2.2.0"
},
@ -287,8 +287,8 @@
"provider-source-address": "registry.terraform.io/poseidon/ct",
"repo": "terraform-provider-ct",
"rev": "v0.10.0",
"sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z",
"vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk",
"sha256": "sha256-P2CwICft0OPcmYC3FT4P4pwS4Svb2kpQe6tzUEnDBfI=",
"vendorSha256": "sha256-E4OmSPV4gTo8I2cSRz+iaFugzGbgJtgKkptPbu8daGI=",
"version": "0.10.0"
},
"datadog": {
@ -350,8 +350,8 @@
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
"repo": "terraform-provider-docker",
"rev": "v2.16.0",
"sha256": "0bh27al9s6zczdz208lr70qab517lsazpi708z6711pgns7qhwjm",
"vendorSha256": "0ykfmksffcc62xwni9dqwgj3vlcmzf6paz6kviljib6sv9vqf0pm",
"sha256": "sha256-VXKIj7bvhnDMR+DE+5WmJ5SlMDiZIiB+++wbnag6Ai4=",
"vendorSha256": "sha256-9QKHd9rarChp3NN8dY37ldE95OO4pWh5F4Yx5/Ssbno=",
"version": "2.16.0"
},
"dome9": {
@ -376,10 +376,10 @@
"owner": "exoscale",
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.36.0",
"sha256": "sha256-cziPxZrvmv3Lpqn2kCwy8DGwOhQCTPcHZg22hYSBW0A=",
"rev": "v0.37.0",
"sha256": "sha256-Rx6T5tb5tZnUsmAOBTFryLFC/Pl06jOgHfFu0kIF7Hk=",
"vendorSha256": null,
"version": "0.36.0"
"version": "0.37.0"
},
"external": {
"owner": "hashicorp",
@ -421,66 +421,66 @@
"owner": "go-gandi",
"provider-source-address": "registry.terraform.io/go-gandi/gandi",
"repo": "terraform-provider-gandi",
"rev": "v2.0.1",
"sha256": "sha256-lcJoDBVoNvNbB5V1rSk09d7pnfVN+FHROtyZCNmZfBk=",
"vendorSha256": "sha256-sloRWqk8j8UWM7gVFaiJ3SmBgnWN/BbFfATQWzpXI7k=",
"version": "2.0.1"
"rev": "v2.1.0",
"sha256": "sha256-TAigFxgn8OufZTXCBhjURLcUaVvOWvNXonn/QV+Bt6I=",
"vendorSha256": "sha256-qDsBI+EruukMnLlLojC2An7lTafQoCkUQU+guhgctSk=",
"version": "2.1.0"
},
"github": {
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.26.0",
"sha256": "sha256-VH5AFT0wDFZ9MJtv+/KlcXD43Tg3QuDHI3vOw6qQoOU=",
"rev": "v4.26.1",
"sha256": "sha256-cfHv8QCx3OCnrXbj/B19bUSg/w4zuIphn6IdNYwGbLU=",
"vendorSha256": null,
"version": "4.26.0"
"version": "4.26.1"
},
"gitlab": {
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
"rev": "v3.15.0",
"sha256": "sha256-UF0yhgynqgW9dnVae19yaDqPsmanyGOgmwU9YaTTYMo=",
"vendorSha256": "sha256-wstFJ0eOIutyexhEvxvdUCAMOW+bPZnc+Ec9C4T5BuI=",
"version": "3.15.0"
"rev": "v3.15.1",
"sha256": "sha256-10dxre+HwpXZ//+PfQvAa3bipHCaJ4+dgaMXiTkSS04=",
"vendorSha256": "sha256-uc29HXlsMRn/MuXlOfYIr49NtfN1goL4y22EX3farBU=",
"version": "3.15.1"
},
"google": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.23.0",
"sha256": "sha256-DXMiLwK3YyTe2R+PayUg5K+n1N/HOkkdoUoBxdKH7Xk=",
"vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=",
"version": "4.23.0"
"rev": "v4.24.0",
"sha256": "sha256-3FnzaT8dROoSZX+JYFLu32UK6PQ272BYXkp1f9C7Z9I=",
"vendorSha256": "sha256-X75Ge7QQy5R3j6nXNMduAPPZlF+koJe6zI8l2KWwpJQ=",
"version": "4.24.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.23.0",
"sha256": "sha256-oqbjH80gDZNFxKjER988TOw9SisaCRULTL9el6aMP44=",
"vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=",
"version": "4.23.0"
"rev": "v4.24.0",
"sha256": "sha256-YgpeilvUnm2HyhRoaQJa6K1+7OSjNESn180h4urFuQo=",
"vendorSha256": "sha256-X75Ge7QQy5R3j6nXNMduAPPZlF+koJe6zI8l2KWwpJQ=",
"version": "4.24.0"
},
"googleworkspace": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/googleworkspace",
"repo": "terraform-provider-googleworkspace",
"rev": "v0.6.0",
"sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi",
"vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655",
"version": "0.6.0"
"rev": "v0.7.0",
"sha256": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
"vendorSha256": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=",
"version": "0.7.0"
},
"grafana": {
"owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.23.0",
"sha256": "sha256-5cOl+HmMKcEA8MOjopH1h8BGuI2wa8QWHUNs3JoFFP0=",
"vendorSha256": "sha256-nnJNYi16nqddMQRCXy9TzsRFGsPOPCF0cWmCDB2m5xM=",
"version": "1.23.0"
"rev": "v1.24.0",
"sha256": "sha256-0E3yWEtt1o+K9/BoawL0Wyt+8yIDADZy6r9Kg7oNYPI=",
"vendorSha256": "sha256-YDWTHiRyY2bzX+ZgYbUTKO3IjsvbIEVWxqGhDNpVnhM=",
"version": "1.24.0"
},
"gridscale": {
"owner": "gridscale",
@ -549,17 +549,17 @@
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.37.0",
"sha256": "sha256-QLeqYLyskWzIW1oG7sO1vYLPeTRCX96dJ6FTSk317kU=",
"rev": "v1.37.1",
"sha256": "sha256-VVhSyUYLFgIb0ZXNWQFjJnXd9LpWCEOTsBmy7z5Fx+0=",
"vendorSha256": null,
"version": "1.37.0"
"version": "1.37.1"
},
"huaweicloudstack": {
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack",
"repo": "terraform-provider-huaweicloudstack",
"rev": "v1.3.0",
"sha256": "0ywik9m2a69262ppsb1d97k7g5b1zwk84k05p7m573f5wakl68jr",
"sha256": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=",
"vendorSha256": null,
"version": "1.3.0"
},
@ -568,7 +568,7 @@
"provider-source-address": "registry.terraform.io/DeterminateSystems/hydra",
"repo": "terraform-provider-hydra",
"rev": "v0.1.2",
"sha256": "1a1ah5pzng9ik8f18kqx87fdh1c5wqbn2bsbhqrzd1nb8fc5xl03",
"sha256": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=",
"vendorSha256": null,
"version": "0.1.2"
},
@ -576,17 +576,17 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
"rev": "v1.41.1",
"sha256": "sha256-eTwv7dtuFe7oEFFqnmpJMN2d/P5ow8HH1rXCE6xBEi4=",
"vendorSha256": "sha256-8s32A0qgODZZy3rSrHnnBkQyKLBj0fcCBJ9ja9gXc5Q=",
"version": "1.41.1"
"rev": "v1.42.0",
"sha256": "sha256-xcE6v1c9c0co+hcBn/MWQBzxgl0a47mvuLtW0iswZ88=",
"vendorSha256": "sha256-q4uuZrXUG3XV4cxL/HCjG/x/giHc/hr+8VENQyXIO1E=",
"version": "1.42.0"
},
"icinga2": {
"owner": "Icinga",
"provider-source-address": "registry.terraform.io/Icinga/icinga2",
"repo": "terraform-provider-icinga2",
"rev": "v0.5.0",
"sha256": "0s8a5i2sl7cp1v6v96s9fbhabrid7mv8hizq509flgzklk8smwv3",
"sha256": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
"vendorSha256": null,
"version": "0.5.0"
},
@ -595,7 +595,7 @@
"provider-source-address": "registry.terraform.io/infobloxopen/infoblox",
"repo": "terraform-provider-infoblox",
"rev": "v2.1.0",
"sha256": "1agxlvm5gxgsfyg1kij09jaly4pj3wfbdc4hk7456m2v1k4r7asn",
"sha256": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=",
"vendorSha256": null,
"version": "2.1.0"
},
@ -613,8 +613,8 @@
"provider-source-address": "registry.terraform.io/Mongey/kafka-connect",
"repo": "terraform-provider-kafka-connect",
"rev": "v0.2.4",
"sha256": "17qslh2axvwiqmqzaxdl75zg3ww6hcpq7k2bfx026ca7bifqx13f",
"vendorSha256": "0acl8ijai4awgxhps17bwnwd9aks0qbjvv4ad6pj8vbf496dc411",
"sha256": "sha256-boSOXVxHMSNAd0vMgy+DhvPxfjm0dfVxxZHvrgSkGp8=",
"vendorSha256": "sha256-IRDWTCJubSSvaYrsLRcGeqrUuOXrBH1hf1yRqGRElCk=",
"version": "0.2.4"
},
"keycloak": {
@ -667,8 +667,8 @@
"provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
"repo": "terraform-provider-libvirt",
"rev": "v0.6.14",
"sha256": "1x1xl3blcs4dpjavf4im82l9vrv0plyyiayy475qjf0sl028criy",
"vendorSha256": "1kq0sbz7sv4gw35wl52z7gjv588r82izhrz7ydf5n0c4d2izmg6a",
"sha256": "sha256-PmaGBKAaOInLId6r6D29YOedqEA1EreVvI1oRtegPfQ=",
"vendorSha256": "sha256-yrz6o2iEAVtc8+dn+KNAGaGy5TtfFMrL4I9sff7SAM8=",
"version": "0.6.14"
},
"linode": {
@ -730,8 +730,8 @@
"provider-source-address": "registry.terraform.io/poseidon/matchbox",
"repo": "terraform-provider-matchbox",
"rev": "v0.5.0",
"sha256": "0lzrs07kzx6bgmlahhgg6j7lpl9z2cbjy2880rwwzq89m8zhl6mz",
"vendorSha256": "0aacb973gisajv0wn00k50ddsma5rv7wy7mjz966a7pgpbmmi91f",
"sha256": "sha256-vxoKP6oJ4c95BggJLxcTP9FLjzTvQahofcv0Pw/Q+VM=",
"vendorSha256": "sha256-LqRY67rvHmVM+rIez8/ORVXdGigTAMvBlkrHN05aTCk=",
"version": "0.5.0"
},
"metal": {
@ -739,7 +739,7 @@
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.2.2",
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
"sha256": "sha256-sQMvTWGjj4UpmyvH1o+NjBHglKvpXPP7H8vfrNxJaKQ=",
"vendorSha256": null,
"version": "3.2.2"
},
@ -784,7 +784,7 @@
"provider-source-address": "registry.terraform.io/AegirHealth/netlify",
"repo": "terraform-provider-netlify",
"rev": "v0.6.12",
"sha256": "0h3ff1ligjvvlmhghx9g92an79b26nyyq5sq4cdsf6psvwfa2kzd",
"sha256": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=",
"vendorSha256": null,
"version": "0.6.12"
},
@ -792,19 +792,19 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.46.1",
"sha256": "sha256-XWCvgBIFOY9fX+WwCoPalHDmFozAm2LPL+R+znDs1XA=",
"vendorSha256": "sha256-bRegJiWC3NvFBEEOAnSbZBT71W0Yeor+bmtXf7lLr78=",
"version": "2.46.1"
"rev": "v2.47.0",
"sha256": "sha256-AXzf6wCQQyxQMRd6w+fiKTSCPebUtW1ZOGs3y7uNRNM=",
"vendorSha256": "sha256-sMH/sdrMxIw/2jzUcYL9WwVNUsn12K+gPMR68zpXYIA=",
"version": "2.47.0"
},
"nomad": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/nomad",
"repo": "terraform-provider-nomad",
"rev": "v1.4.16",
"sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw",
"vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j",
"version": "1.4.16"
"rev": "v1.4.17",
"sha256": "sha256-xP0E2rJbsthLIzN0zxDo1eGMb8xBetT+uuCcegVvJUU=",
"vendorSha256": "sha256-p+SCagP8Niuc4h1s8l1c7Dao78wnHPRz9vNbFH10BaA=",
"version": "1.4.17"
},
"ns1": {
"owner": "ns1-terraform",
@ -847,26 +847,26 @@
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.78.0",
"sha256": "sha256-LIqvRsE2m3j0cgqJyyXVcxlEHpCl8UTYucCbHmG7dTo=",
"rev": "v4.79.0",
"sha256": "sha256-GFfrcRsFcSx/X5HpKkV+s2XCgt8qDGQSIdVUgVUjbXM=",
"vendorSha256": null,
"version": "4.78.0"
"version": "4.79.0"
},
"okta": {
"owner": "okta",
"provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
"rev": "v3.28.0",
"sha256": "sha256-1lTmXcBdCwQFDyO6ABByGl1klvTU8r6DpOrCX0l/aTU=",
"vendorSha256": "sha256-uI+C8LFw+R0np2dN1aUbcR2shVNhg6fiBICr0aWyngY=",
"version": "3.28.0"
"rev": "v3.29.0",
"sha256": "sha256-mv9dgefqAiemaKb3eqyh1L/vGyqwNUV7h+JfjwDnpeI=",
"vendorSha256": "sha256-TJbzfyzyDb2oi65CJwYRSzYY40ljQfRaxAKrxazuhns=",
"version": "3.29.0"
},
"oktaasa": {
"owner": "oktadeveloper",
"provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa",
"repo": "terraform-provider-oktaasa",
"rev": "v1.0.1",
"sha256": "0ibpa3bb7p5i02bliycg6bcak79gmixww7gc1k1z0aiaij173f6q",
"sha256": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
"vendorSha256": null,
"version": "1.0.1"
},
@ -874,18 +874,18 @@
"owner": "OpenNebula",
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
"repo": "terraform-provider-opennebula",
"rev": "v0.4.3",
"sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=",
"vendorSha256": null,
"version": "0.4.3"
"rev": "v0.5.0",
"sha256": "sha256-MJQQyU+NmLbIWSQY1BqWKY7q9RrF+HAFIr8AFNg2dWc=",
"vendorSha256": "sha256-NOIXn4RWMUz0invWRqAHxVWez7MD0DyWccwcKYz8jTY=",
"version": "0.5.0"
},
"openstack": {
"owner": "terraform-provider-openstack",
"provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack",
"repo": "terraform-provider-openstack",
"rev": "v1.47.0",
"sha256": "0hbp5hk3b9fdsyqkxb3fzpjiw5dd7h7f3gs3xv5imzkfv1dmqghz",
"vendorSha256": "007qmkgp5svhy7gvlkbyxllh0ijsk4xq5kmy7zmjgf7mawp16ny6",
"sha256": "sha256-Hz5cW9hu/hrL7kO/4Q48rRUe5f1urD6x182lNSYsd0E=",
"vendorSha256": "sha256-xlsTLlf1uCfrP77OgjuZWkYAKe1+Tbrf8XDrct+s+AA=",
"version": "1.47.0"
},
"opentelekomcloud": {
@ -902,7 +902,7 @@
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.10",
"sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw",
"sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=",
"vendorSha256": null,
"version": "0.6.10"
},
@ -910,19 +910,19 @@
"owner": "ovh",
"provider-source-address": "registry.terraform.io/ovh/ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.17.1",
"sha256": "sha256-bAwOxRexJuSw3Ntb8zXeTFPp23hCkCEI+zF4Q2SP3lA=",
"rev": "v0.18.0",
"sha256": "sha256-GTyhXAFf0GqjeYh961DyE1ujjUlll5ifGryJGzo9BEI=",
"vendorSha256": null,
"version": "0.17.1"
"version": "0.18.0"
},
"pagerduty": {
"owner": "PagerDuty",
"provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.5.0",
"sha256": "sha256-ylGqFN4y6MgCII+iOpUE0R93DLRu+Gbipk5I7LlB9dQ=",
"rev": "v2.5.1",
"sha256": "sha256-BcPfV+2izOiEk0hEuZOFDkQKPSXWzZ1skwu/moeKTD8=",
"vendorSha256": null,
"version": "2.5.0"
"version": "2.5.1"
},
"panos": {
"owner": "PaloAltoNetworks",
@ -938,8 +938,8 @@
"provider-source-address": "registry.terraform.io/camptocamp/pass",
"repo": "terraform-provider-pass",
"rev": "v2.0.0",
"sha256": "1hzfz9ca01i8q9gc0aisklblkyfgzn9bqndis7l0964r1rdhsn44",
"vendorSha256": "0fsl27p2p6s4xnmhlzb8bxrg8kjaaim7arj0l6p5y0z9mhy8jpmi",
"sha256": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=",
"vendorSha256": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=",
"version": "2.0.0"
},
"postgresql": {
@ -965,8 +965,8 @@
"provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq",
"repo": "terraform-provider-rabbitmq",
"rev": "v1.6.0",
"sha256": "0src4d032z3mpv10fgya2izqm8qfdgr87rfhpnld1r90yvxqgnl2",
"vendorSha256": "0m5siifbq0j68dx2hapczhjlyq9wrgwf360vnl08fqlgrl0f7ff1",
"sha256": "sha256-gtqH+/Yg5dCovdDlg/JrDqOKfxTKPwfCvnV8MUAjLGs=",
"vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=",
"version": "1.6.0"
},
"rancher2": {
@ -982,26 +982,26 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/random",
"repo": "terraform-provider-random",
"rev": "v3.2.0",
"sha256": "sha256-acB1BHGxquiK137OfTe31pUGHdWp7xxlv5BINNzNLSs=",
"vendorSha256": "sha256-MMUit5RxsymBNX9fH8B6D2gJ/k5zaN6FCyP9N/+TV+E=",
"version": "3.2.0"
"rev": "v3.3.1",
"sha256": "sha256-hsNGJmhYrzQhQ0acidx3/dkNFRIabMfgvJsM2Uz+7cE=",
"vendorSha256": "sha256-73/tsfe5YoPTpEGUBvBV6jYGFjSNG9h3AY680tAzM7M=",
"version": "3.3.1"
},
"remote": {
"owner": "tenstad",
"provider-source-address": "registry.terraform.io/tenstad/remote",
"repo": "terraform-provider-remote",
"rev": "v0.0.24",
"sha256": "sha256-ksOp9okCdJXOQOsJrJ6tD+aLpPIuwkIxuIGtQ+d7e4k=",
"vendorSha256": "sha256-AAqilm26uz3Kt/JxwEbi8GULZstIs/6Vc+uShXbsZTs=",
"version": "0.0.24"
"rev": "v0.0.25",
"sha256": "sha256-sthHyzjf/6sgI0Acw//Z4ybxy4TwNpPIi8f7MmJh0N0=",
"vendorSha256": "sha256-ckPs3iaFbmHbBnwRuYn9XdnGZsj+UoYK4OE/9B6Z6Kc=",
"version": "0.0.25"
},
"rundeck": {
"owner": "rundeck",
"provider-source-address": "registry.terraform.io/rundeck/rundeck",
"repo": "terraform-provider-rundeck",
"rev": "v0.4.3",
"sha256": "1bvk5mfjpl57dfglksnz1cnvd5qgk2cnidwiwjwa3ssmm2kzji8s",
"sha256": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=",
"vendorSha256": null,
"version": "0.4.3"
},
@ -1019,7 +1019,7 @@
"provider-source-address": "registry.terraform.io/numtide/secret",
"repo": "terraform-provider-secret",
"rev": "v1.2.0",
"sha256": "1211vvcd00llajza3chw25h0sl43wl116ni4r251k00m6kb5nfwq",
"sha256": "sha256-mDtb1jQVgBmKyCRaEwLlg1ANYBEcsqG+VJQC0NjeIYg=",
"vendorSha256": null,
"version": "1.2.0"
},
@ -1046,8 +1046,8 @@
"provider-source-address": "registry.terraform.io/scottwinkler/shell",
"repo": "terraform-provider-shell",
"rev": "v1.7.10",
"sha256": "15pw8i1j47ppwrrh1gpfdkba54zab50ziqfqsc17pmv2gisq8d9d",
"vendorSha256": "1vgs7nvqa25c0qxhj7jpjfphshxsqhxvxnr9ny7x4ghzg9ab90rh",
"sha256": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
"vendorSha256": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=",
"version": "1.7.10"
},
"signalfx": {
@ -1064,7 +1064,7 @@
"provider-source-address": "registry.terraform.io/skytap/skytap",
"repo": "terraform-provider-skytap",
"rev": "v0.14.5",
"sha256": "1l73p0ii9pnbvdv2gi69782w4yvfkf15cx1zvx3k0961wav4f5gj",
"sha256": "sha256-8hVHtuLBJDBH3z90VoKbbnvCBTrJxCd228veFCO449A=",
"vendorSha256": null,
"version": "0.14.5"
},
@ -1072,10 +1072,10 @@
"owner": "Snowflake-Labs",
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.34.0",
"sha256": "sha256-7FQp5lDm6WKFmtk9V8Sf+e5J4tLpAOfgMKpbcQRcfIE=",
"vendorSha256": "sha256-HGukjbPQyQpFnVkgUnreQlNAW9nhLirnQnYIpBfFe+M=",
"version": "0.34.0"
"rev": "v0.35.0",
"sha256": "sha256-RSwSyNQmHzx5cn6aiaInP4m/fCgWkL/1lMoJAib3fkA=",
"vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=",
"version": "0.35.0"
},
"sops": {
"owner": "carlpett",
@ -1100,8 +1100,8 @@
"provider-source-address": "registry.terraform.io/stackpath/stackpath",
"repo": "terraform-provider-stackpath",
"rev": "v1.4.0",
"sha256": "1c9ad2hwglajs9qsbkm0d01qfvqzi2mf4i0cxynx1f560hg7sd4x",
"vendorSha256": "1i65k1j6yfma1m7lr8qs714pv6rqvy0i8zycpjpdbcbmw3h2xy8n",
"sha256": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
"vendorSha256": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=",
"version": "1.4.0"
},
"statuscake": {
@ -1117,19 +1117,19 @@
"owner": "SumoLogic",
"provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
"repo": "terraform-provider-sumologic",
"rev": "v2.16.0",
"sha256": "sha256-27+ofT5p073s2kEk87P/Witw5x9sVKOYrlBXp6/xKxk=",
"rev": "v2.16.1",
"sha256": "sha256-CLqDFqYoScQTQuaB36CupWHuF8rUn8PBV8EJ0MJuIeE=",
"vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=",
"version": "2.16.0"
"version": "2.16.1"
},
"tencentcloud": {
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.72.8",
"sha256": "sha256-yV2nS8FzhUpCVZR1StHhOb4zqJ8jxc+NRw/bnmDzfX8=",
"rev": "v1.73.1",
"sha256": "sha256-vMWT4Kj8ROf3iTSd1Gy/CfuiDEQUUjfRR8+nSlbhrZo=",
"vendorSha256": null,
"version": "1.72.8"
"version": "1.73.1"
},
"tfe": {
"owner": "hashicorp",
@ -1154,8 +1154,8 @@
"provider-source-address": "registry.terraform.io/hashicorp/time",
"repo": "terraform-provider-time",
"rev": "v0.7.2",
"sha256": "02b7l65civmphhdax05ajvbfm2ilqf421di1p3vj1zysz194wgl2",
"vendorSha256": "06f5rkxcfc221jl84x4z8q5iydrv8lypancn05kxj0ck89vhf650",
"sha256": "sha256-gj5OUvja/yD3uCG2IIjDNIrq1paqgK4ahLfuyIqhZwk=",
"vendorSha256": "sha256-oBgHd0KTAdlnAZZZdT1FOzcfC0afdIKoDEIwx/rMxRk=",
"version": "0.7.2"
},
"tls": {
@ -1173,8 +1173,8 @@
"provider-source-address": "registry.terraform.io/joyent/triton",
"repo": "terraform-provider-triton",
"rev": "v0.8.2",
"sha256": "0jhvslpv18yql5hz67hvagv5xdlnn6qsnvs91g0wf5rr4zbcmd9n",
"vendorSha256": "1a9a5jpbn8bikyya50zp1aaacj699gmk9p870a73ksh6w5lcgqjj",
"sha256": "sha256-NrXK1ic5F8fBC0lvq7GxlrZe9lMbHvNhodijsC/VG0o=",
"vendorSha256": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=",
"version": "0.8.2"
},
"turbot": {
@ -1182,7 +1182,7 @@
"provider-source-address": "registry.terraform.io/turbot/turbot",
"repo": "terraform-provider-turbot",
"rev": "v1.8.3",
"sha256": "0jx37w4sbm7gj8vqnb58rg24s6fafc73ds954vqh9rjn8a6x0qz9",
"sha256": "sha256-6WPQjUJW5gTxJiXpNg5zyhlNxMuoLIs3ku/UpQk/o0s=",
"vendorSha256": null,
"version": "1.8.3"
},
@ -1236,8 +1236,8 @@
"provider-source-address": "registry.terraform.io/ondrejsika/vercel",
"repo": "terraform-provider-vercel",
"rev": "v2.1.0",
"sha256": "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw",
"vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k",
"sha256": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=",
"vendorSha256": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=",
"version": "2.1.0"
},
"vpsadmin": {
@ -1245,8 +1245,8 @@
"provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin",
"repo": "terraform-provider-vpsadmin",
"rev": "v1.0.0",
"sha256": "1ci86ikdz8i6gwdiif4ayx15hjm9phr756rvywz8pblaa6niwl9h",
"vendorSha256": "1wc0kzinz39kv4gib438js2qv07ndm6yj2qpj041d75hnlq06drv",
"sha256": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=",
"vendorSha256": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=",
"version": "1.0.0"
},
"vra7": {

View file

@ -3,39 +3,44 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, pkg-config
, gpgme
, glibc
, lvm2
, btrfs-progs
, glibc
}:
buildGoModule rec {
pname = "werf";
version = "1.2.107";
version = "1.2.114";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-a66BN8thTEKrXCOXpYIlbQnlA0VYEomQrc/m87qn6j4=";
sha256 = "sha256-+QCKVXuROd7QB6P5tSSINWtdw5OvVnmE1+ttoBnCO1g=";
};
vendorSha256 = "sha256-NwrkjeDicp4fmeviTCSs9lSg33Cgpv8tBdm84RJz/gQ=";
vendorSha256 = "sha256-VuburDiYqePFvS7/aTM+krkK2UhTHhfbvGOLY3I3DN8=";
proxyVendor = true;
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ gpgme ]
++ lib.optionals stdenv.isLinux [ glibc.static lvm2 btrfs-progs ];
subPackages = [ "cmd/werf" ];
# Flags are derived from
# https://github.com/werf/werf/blob/main/scripts/build_release_v3.sh
ldflags = [ "-s" "-w" "-X github.com/werf/werf/pkg/werf.Version=v${version}" ]
++ lib.optionals stdenv.isLinux [
"-linkmode external"
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs glibc.static ];
ldflags = [
"-s"
"-w"
"-X github.com/werf/werf/pkg/werf.Version=${src.rev}"
] ++ lib.optionals stdenv.isLinux [
"-extldflags=-static"
"-linkmode external"
];
tags = [ "dfrunmount" "dfssh" "containers_image_openpgp" ]
++ lib.optionals stdenv.isLinux [
tags = [
"containers_image_openpgp"
"dfrunmount"
"dfssh"
] ++ lib.optionals stdenv.isLinux [
"exclude_graphdriver_devicemapper"
"netgo"
"no_devmapper"
@ -43,7 +48,8 @@ buildGoModule rec {
"static_build"
];
subPackages = [ "cmd/werf" ];
# There are no tests for cmd/werf.
doCheck = false;
postInstall = ''
installShellCompletion --cmd werf \
@ -52,8 +58,13 @@ buildGoModule rec {
'';
meta = with lib; {
homepage = "https://github.com/werf/werf";
description = "GitOps delivery tool";
longDescription = ''
The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to
implement CI/CD and Giterminism.
'';
homepage = "https://werf.io";
changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ azahi ];
};

View file

@ -27,12 +27,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.4";
version = "2.2.5";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0q70qrsjvmkfns1qxc0il2rlmfjwzbmfg89zlch0iqghpyz7c9xq";
sha256 = "0ivyfld4a4sfzsdiaajqiarvfx4i85g1smbb2b5dqjkrb48pi2zz";
};
patches = optional smimeSupport (fetchpatch {

View file

@ -8,7 +8,40 @@
, enableSSH ? false
}:
python3.pkgs.buildPythonApplication rec {
let
py = python3.override {
packageOverrides = self: super: {
grandalf = super.grandalf.overridePythonAttrs (oldAttrs: rec {
version = "0.6";
src = fetchFromGitHub {
owner = "bdcht";
repo = "grandalf";
rev = "v${version}";
hash = "sha256-T4pVzjz1WbfBA2ybN4IRK73PD/eb83YUW0BZrBESNLg=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "setup_requires=['pytest-runner',]," ""
'';
});
scmrepo = super.scmrepo.overridePythonAttrs (oldAttrs: rec {
version = "0.0.19";
src = fetchFromGitHub {
owner = "iterative";
repo = "scmrepo";
rev = "refs/tags/${version}";
hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY=";
};
});
};
};
in
with py.pkgs;
buildPythonApplication rec {
pname = "dvc";
version = "2.10.2";
format = "setuptools";
@ -20,12 +53,12 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-boaQSg0jajWQZKB5wvcP2musVR2/pifT4pU64Y5hiQ0=";
};
nativeBuildInputs = with python3.pkgs; [
nativeBuildInputs = with py.pkgs; [
setuptools-scm
setuptools-scm-git-archive
];
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with py.pkgs; [
aiohttp-retry
appdirs
colorama
@ -78,9 +111,6 @@ python3.pkgs.buildPythonApplication rec {
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "grandalf==0.6" "grandalf>=0.6" \
--replace "scmrepo==0.0.19" "scmrepo"
substituteInPlace dvc/daemon.py \
--subst-var-by dvc "$out/bin/dcv"
'';

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "distrobox";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "89luca89";
repo = pname;
rev = version;
sha256 = "sha256-31SDi9B6Ug6lRDMgaMp6lwdSsmQ7ywEwjG1Ez/jXjBc=";
sha256 = "sha256-7qPEtWDshe3bHUvbf35k31EnL2sQEXeDmMUGBPkiB9U=";
};
dontConfigure = true;

View file

@ -5,6 +5,7 @@
let
swig = callPackage ./swig.nix { };
bootForth = callPackage ./boot-forth.nix { };
lispDir = "${placeholder "out"}/share/emacs/site-lisp";
in stdenv.mkDerivation rec {
pname = "gforth";
@ -26,15 +27,17 @@ in stdenv.mkDerivation rec {
passthru = { inherit bootForth; };
configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
configureFlags = [
"--with-lispdir=${lispDir}"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
"--build=x86_64-apple-darwin"
];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
cp gforth.el $out/share/emacs/site-lisp/
preConfigure = ''
mkdir -p ${lispDir}
'';
meta = {
broken = stdenv.isDarwin;
description = "The Forth implementation of the GNU project";
homepage = "https://github.com/forthy42/gforth";
license = lib.licenses.gpl3;

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
@ -13,21 +12,13 @@
stdenv.mkDerivation rec {
pname = "jemalloc";
version = "5.2.1";
version = "5.3.0";
src = fetchurl {
url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl";
sha256 = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo=";
};
patches = [
# workaround https://github.com/jemalloc/jemalloc/issues/2091
(fetchpatch {
url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff";
sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI=";
})
];
# see the comment on stripPrefix
configureFlags = []
++ lib.optional stripPrefix "--with-jemalloc-prefix="
@ -41,6 +32,8 @@ stdenv.mkDerivation rec {
]
;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds";
doCheck = true;
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }:
{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader, wayland, pkg-config }:
stdenv.mkDerivation rec {
pname = "openxr-loader";
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE=";
};
nativeBuildInputs = [ cmake python3 ];
buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ];
nativeBuildInputs = [ cmake python3 pkg-config ];
buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader wayland ];
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
cmakeFlags = [ "-DBUILD_TESTS=ON" ];
outputs = [ "out" "dev" "layers" ];

View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.30";
version = "0.0.31";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xN3H3l4ANT7/tXg+oGScvE0Atf6h9CVbODaWybe8a9o=";
sha256 = "sha256-hoVmkBrXc2AN5K/vZpxby1U7huhXbfFCiy+2Njt+2Lk=";
};
postPatch = ''

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.21.2";
version = "1.23.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oKHGowW/LetNGtMA/sTWhmc98Tt6X475CbpqI88g4Jc=";
sha256 = "sha256-7NpnEuvYjffxapVKs9pYiLVWGyUBwFwvz/GVKURa95Y=";
};
ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-l39wXMgJLWIf0TcM6VQpcV4ckHqW/SjMy07e9w7dbgs=";
vendorSha256 = "sha256-Y6ZsLezx7rhGFkWVBpwYlfXWJU9V4u4lJ4AsyJbXTUk=";
subPackages = [
"cmd/tfsec"

View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "hound";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "hound-search";
repo = "hound";
rev = "v${version}";
sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65";
sha256 = "sha256-FNK6SgISGqx+O7Vgp+KOqQyPhqzERDjeo6mQIX1SXnA=";
};
vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6";
vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -12,7 +12,6 @@
, curl
, flex
, gnutls
, jemalloc
, libconfig
, libdaemon
, libev
@ -99,7 +98,6 @@ stdenv.mkDerivation rec {
${lib.concatMapStringsSep "\n"
(x: ''replace_dep "${x.f}" "${x.p.src}" "${x.p.pname or (builtins.parseDrvName x.p.name).name}" "${x.p.name}"'') [
{ f = "curl"; p = curl; }
{ f = "jemalloc"; p = jemalloc; }
{ f = "libconfig"; p = libconfig; }
{ f = "libdaemon"; p = libdaemon; }
{ f = "libev"; p = libev; }

View file

@ -112,7 +112,7 @@
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
lz4: lz4/lz4/liblz4.a
@@ -148,16 +112,12 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
@@ -148,16 +112,14 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
@ -124,8 +124,8 @@
libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a
jemalloc/jemalloc/lib/libjemalloc.a:
- cd jemalloc && rm -rf jemalloc-5.2.0
- cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2
cd jemalloc && rm -rf jemalloc-5.2.0
cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch
cd jemalloc/jemalloc && ./configure ${MYJEOPT}

View file

@ -0,0 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "awsls";
version = "0.11.0";
src = fetchFromGitHub {
owner = "jckuester";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iy9tohmVUtNXYVfe6pZ+pbbLlcK6Fu1GgzTWMD+3xP0=";
};
vendorSha256 = "sha256-ZyMO+KCqoePF6MqHFt8X4tZR4nBhuSPgJDrX+emM6jc=";
ldflags =
let t = "github.com/jckuester/awsls/internal";
in [ "-s" "-w" "-X ${t}.version=${version}" "-X ${t}.commit=${src.rev}" "-X ${t}.date=unknown" ];
doCheck = false;
meta = with lib; {
description = "A list command for AWS resources";
homepage = "https://github.com/jckuester/awsls";
license = licenses.mit;
maintainers = [ maintainers.markus1189 ];
};
}

View file

@ -0,0 +1,125 @@
{ lib
, stdenv
, fetchFromGitHub
, asio
, autoconf-archive
, autoreconfHook
, fetchpatch
, glib
, gtest
, jsoncpp
, libcap_ng
, libnl
, libuuid
, lz4
, openssl
, pkg-config
, protobuf
, python3
, tinyxml-2
, wrapGAppsHook
}:
let
openvpn3-core = fetchFromGitHub {
owner = "OpenVPN";
repo = "openvpn3";
rev = "7765540e581c48721752bcad0b3d74b8397b1f73";
sha256 = "sha256-v/suF/tWfuukQO1wFiHRzC7ZW+3Gh1tav6qj0uYUP4E=";
};
in
stdenv.mkDerivation rec {
pname = "openvpn3";
# also update openvpn3-core
version = "17_beta";
src = fetchFromGitHub {
owner = "OpenVPN";
repo = "openvpn3-linux";
rev = "v${version}";
sha256 = "sha256-ITSnC105YNYFW1M2bOASFemPZAh+HETIzX2ofABWTho=";
};
patches = [
# remove when v18_beta hits
(fetchpatch {
name = "dont-hardcode-gio.patch";
url = "https://github.com/OpenVPN/openvpn3-linux/commit/f7d6d3ae1d52b18b398d3d3b6e21c720c98d0e89.patch";
sha256 = "sha256-Bo5uaHadMTDROpwM7Y5aXhCoGUrsAAkSxeXLLhvOeEg=";
})
];
postPatch = ''
rm -r ./vendor/googletest
cp -r ${gtest.src} ./vendor/googletest
rm -r ./openvpn3-core
ln -s ${openvpn3-core} ./openvpn3-core
chmod -R +w ./vendor/googletest
shopt -s globstar
patchShebangs **/*.py **/*.sh ./src/python/{openvpn2,openvpn3-as,openvpn3-autoload} \
./distro/systemd/openvpn3-systemd ./src/tests/dbus/netcfg-subscription-test
echo "3.git:v${version}:unknown" > openvpn3-core-version
'';
preAutoreconf = ''
substituteInPlace ./update-version-m4.sh --replace 'VERSION="$(git describe --always --tags)"' "VERSION=v${version}"
./update-version-m4.sh
'';
nativeBuildInputs = [
autoconf-archive
autoreconfHook
python3.pkgs.docutils
python3.pkgs.jinja2
pkg-config
wrapGAppsHook
python3.pkgs.wrapPython
] ++ pythonPath;
buildInputs = [
asio
glib
jsoncpp
libcap_ng
libnl
libuuid
lz4
openssl
protobuf
tinyxml-2
];
# runtime deps
pythonPath = with python3.pkgs; [
dbus-python
pygobject3
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
postFixup = ''
wrapPythonPrograms
'';
configureFlags = [
"--enable-bash-completion"
"--enable-addons-aws"
"--disable-selinux-build"
"--disable-build-test-progs"
];
NIX_LDFLAGS = "-lpthread";
meta = with lib; {
description = "OpenVPN 3 Linux client";
license = licenses.agpl3Plus;
homepage = "https://github.com/OpenVPN/openvpn3-linux/";
maintainers = with maintainers; [ shamilton kfears ];
platforms = platforms.linux;
};
}

View file

@ -2605,6 +2605,8 @@ with pkgs;
aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
awsls = callPackage ../tools/admin/awsls { };
awstats = callPackage ../tools/system/awstats { };
awsweeper = callPackage ../tools/admin/awsweeper { };
@ -9062,6 +9064,8 @@ with pkgs;
openvpn_24
openvpn;
openvpn3 = callPackage ../tools/networking/openvpn3 { };
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix {
@ -16412,7 +16416,9 @@ with pkgs;
tflint = callPackage ../development/tools/analysis/tflint { };
tfsec = callPackage ../development/tools/analysis/tfsec { };
tfsec = callPackage ../development/tools/analysis/tfsec {
buildGoModule = buildGo118Module;
};
todoist = callPackage ../applications/misc/todoist { };