Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-23 12:01:12 +00:00 committed by GitHub
commit 9179666d33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
52 changed files with 3255 additions and 1387 deletions

View File

@ -205,6 +205,13 @@
<link linkend="opt-services.outline.enable">services.outline</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://netbird.io">netbird</link>, a zero
configuration VPN. Available as
<link xlink:href="options.html#opt-services.netbird.enable">services.netbird</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/aiberia/persistent-evdev">persistent-evdev</link>,

View File

@ -76,6 +76,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
- [netbird](https://netbird.io), a zero configuration VPN.
Available as [services.netbird](options.html#opt-services.netbird.enable).
- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable).
- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable).

View File

@ -861,6 +861,7 @@
./services/networking/nbd.nix
./services/networking/ndppd.nix
./services/networking/nebula.nix
./services/networking/netbird.nix
./services/networking/networkmanager.nix
./services/networking/nextdns.nix
./services/networking/nftables.nix

View File

@ -0,0 +1,64 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.netbird;
kernel = config.boot.kernelPackages;
interfaceName = "wt0";
in {
meta.maintainers = with maintainers; [ misuzu ];
options.services.netbird = {
enable = mkEnableOption "Netbird daemon";
package = mkOption {
type = types.package;
default = pkgs.netbird;
defaultText = literalExpression "pkgs.netbird";
description = "The package to use for netbird";
};
};
config = mkIf cfg.enable {
boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
environment.systemPackages = [ cfg.package ];
networking.dhcpcd.denyInterfaces = [ interfaceName ];
systemd.network.networks."50-netbird" = mkIf config.networking.useNetworkd {
matchConfig = {
Name = interfaceName;
};
linkConfig = {
Unmanaged = true;
ActivationPolicy = "manual";
};
};
systemd.services.netbird = {
description = "A WireGuard-based mesh network that connects your devices into a single private network";
documentation = [ "https://netbird.io/docs/" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
DynamicUser = true;
Environment = [
"NB_CONFIG=/var/lib/netbird/config.json"
"NB_LOG_FILE=console"
];
ExecStart = "${cfg.package}/bin/netbird service run";
Restart = "always";
RuntimeDirectory = "netbird";
StateDirectory = "netbird";
WorkingDirectory = "/var/lib/netbird";
};
unitConfig = {
StartLimitInterval = 5;
StartLimitBurst = 10;
};
stopIfChanged = false;
};
};
}

View File

@ -98,12 +98,6 @@ let
addDeviceNames =
imap1 (idx: drive: drive // { device = driveDeviceName idx; });
efiPrefix =
if pkgs.stdenv.hostPlatform.isx86 then "${pkgs.OVMF.fd}/FV/OVMF"
else if pkgs.stdenv.isAarch64 then "${pkgs.OVMF.fd}/FV/AAVMF"
else throw "No EFI firmware available for platform";
efiFirmware = "${efiPrefix}_CODE.fd";
efiVarsDefault = "${efiPrefix}_VARS.fd";
# Shell script to start the VM.
startVM =
@ -218,14 +212,14 @@ let
${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M"
${if cfg.useEFIBoot then ''
efiVars=$out/efi-vars.fd
cp ${efiVarsDefault} $efiVars
cp ${cfg.efi.variables} $efiVars
chmod 0644 $efiVars
'' else ""}
'';
buildInputs = [ pkgs.util-linux ];
QEMU_OPTS = "-nographic -serial stdio -monitor none"
+ lib.optionalString cfg.useEFIBoot (
" -drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
" -drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}"
+ " -drive if=pflash,format=raw,unit=1,file=$efiVars");
}
''
@ -705,8 +699,31 @@ in
manager.
useEFIBoot is ignored if useBootLoader == false.
'';
};
virtualisation.efi = {
firmware = mkOption {
type = types.path;
default = pkgs.OVMF.firmware;
defaultText = "pkgs.OVMF.firmware";
description =
lib.mdDoc ''
Firmware binary for EFI implementation, defaults to OVMF.
'';
};
variables = mkOption {
type = types.path;
default = pkgs.OVMF.variables;
defaultText = "pkgs.OVMF.variables";
description =
lib.mdDoc ''
Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware.
Defaults to OVMF.
'';
};
};
virtualisation.useDefaultFilesystems =
mkOption {
type = types.bool;
@ -928,7 +945,7 @@ in
''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
])
(mkIf cfg.useEFIBoot [
"-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
"-drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}"
"-drive if=pflash,format=raw,unit=1,file=$NIX_EFI_VARS"
])
(mkIf (cfg.bios != null) [

View File

@ -358,6 +358,7 @@ in {
ncdns = handleTest ./ncdns.nix {};
ndppd = handleTest ./ndppd.nix {};
nebula = handleTest ./nebula.nix {};
netbird = handleTest ./netbird.nix {};
neo4j = handleTest ./neo4j.nix {};
netdata = handleTest ./netdata.nix {};
networking.networkd = handleTest ./networking.nix { networkd = true; };

21
nixos/tests/netbird.nix Normal file
View File

@ -0,0 +1,21 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "netbird";
meta = with pkgs.lib.maintainers; {
maintainers = [ misuzu ];
};
nodes = {
node = { ... }: {
services.netbird.enable = true;
};
};
testScript = ''
start_all()
node.wait_for_unit("netbird.service")
node.wait_for_file("/var/run/netbird/sock")
node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'")
'';
})

View File

@ -5,14 +5,14 @@
mkDerivation rec {
pname = "qpwgraph";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
sha256 = "sha256-JCnvwSredXO1WrTu4BIUaUTTjPcd5U/ZZcRbI/GiFfc=";
sha256 = "sha256-ZpVQjlqz1aPpf04qHMsN06s1n5msf32oB7cJYZf6xAU=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
checkInputs = [
bc
perl
perlPackages.DigestMD5
(python3.withPackages (ps: with ps; [ numpy scipy ]))
] ++ lib.optionals withMPI [ mpi openssh ];

View File

@ -1,18 +1,19 @@
{
"version": "15.2.2",
"repo_hash": "sha256-Rb6u47Ehx1Kee3FFsoFa6ZqpU7c00ToEelvfjyG3aiI=",
"yarn_hash": "154akdngdagwfn8s90aw6sajw058i507shv5wzdn8l0vy3badgkv",
"version": "15.3.1",
"repo_hash": "sha256-WSo1yh/stYzbNWS1XOO4wf4Jg4vvfGn3ugje1kMTtiA=",
"yarn_hash": "1cmz4815vfrgnh6khnx1hi0nnkz5xcrx8cqd9dxyd66pzwlyllx0",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.2.2-ee",
"rev": "v15.3.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.2.2",
"GITLAB_PAGES_VERSION": "1.61.1",
"GITLAB_SHELL_VERSION": "14.9.0",
"GITLAB_WORKHORSE_VERSION": "15.2.2"
"GITALY_SERVER_VERSION": "15.3.1",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
"GITLAB_WORKHORSE_VERSION": "15.3.1"
},
"vendored_gems": [
"devise-pbkdf2-encryptable",
"omniauth-cas3",
"omniauth-gitlab",
"omniauth_crowd",
"mail-smtp_pool",

View File

@ -136,6 +136,9 @@ stdenv.mkDerivation {
patches = [
# Change hardcoded paths to the NixOS equivalent
./remove-hardcoded-locations.patch
# Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946)
./update-pg.patch
];
postPatch = ''

View File

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'rugged', '~> 1.2'
gem 'github-linguist', '~> 7.20.0', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.1.4.7'
gem 'activesupport', '~> 6.1.6.1'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
@ -19,7 +19,7 @@ gem 'gitlab-labkit', '~> 0.23'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.14.1'
gem 'google-protobuf', '~> 3.19.0'
gem 'google-protobuf', '~> 3.21.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false

View File

@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (6.1.4.7)
actionview (= 6.1.4.7)
activesupport (= 6.1.4.7)
actionpack (6.1.6.1)
actionview (= 6.1.6.1)
activesupport (= 6.1.6.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.4.7)
activesupport (= 6.1.4.7)
actionview (6.1.6.1)
activesupport (= 6.1.6.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.4.7)
activesupport (6.1.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -81,14 +81,14 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.7.1)
google-protobuf (3.19.1)
google-protobuf (3.21.3)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
google-protobuf (~> 3.18)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.42.0)
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (1.1.0)
@ -112,10 +112,10 @@ GEM
mime-types-data (3.2020.1104)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.15.0)
minitest (5.16.2)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.13.6)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.20.0)
@ -205,7 +205,7 @@ GEM
thrift (0.15.0)
timecop (0.9.1)
tomlrb (2.0.1)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
unparser (0.4.7)
@ -219,13 +219,13 @@ GEM
with_env (1.1.0)
xml-simple (1.1.9)
rexml
zeitwerk (2.5.4)
zeitwerk (2.6.0)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 6.1.4.7)
activesupport (~> 6.1.6.1)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.20.0)
@ -234,7 +234,7 @@ DEPENDENCIES
gitlab-labkit (~> 0.23)
gitlab-license_finder
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.19.0)
google-protobuf (~> 3.21.0)
grpc (~> 1.42.0)
grpc-tools (~> 1.42.0)
licensee (~> 9.14.1)

View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.2.2";
version = "15.3.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,10 +22,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-ZePtqpe5zwbslgisIQ+BFM9vtnWknB75gtgoOlkbuyo=";
sha256 = "sha256-g2w75eTjRUsKc2A0rue4Ei45nXrM0NjQk0LhRuhdUXQ=";
};
vendorSha256 = "sha256-aKF7iupg3XNopi0asasSu5ug+2M9p2nwxk/0g5how6U=";
vendorSha256 = "sha256-aPCcTS5zflpjzb2L/oDOQotdL8cFsgKPa8b+lhCpbag=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
@ -40,7 +40,7 @@ let
auxBins = buildGoModule ({
pname = "gitaly-aux";
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go-v15" "cmd/gitaly-lfs-smudge" ];
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" ];
} // commonOpts);
in
buildGoModule ({

View File

@ -13,10 +13,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";
sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +24,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";
sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";
sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@ -302,10 +302,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53";
sha256 = "0825yplkfp8xf0vpl25ff58xrlah98x9yv3hj9pgl82b0gqali6p";
type = "gem";
};
version = "3.19.1";
version = "3.21.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -345,10 +345,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
version = "1.10.0";
version = "1.12.0";
};
ice_nine = {
source = {
@ -464,10 +464,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
type = "gem";
};
version = "5.15.0";
version = "5.16.2";
};
msgpack = {
groups = ["default"];
@ -495,10 +495,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr";
type = "gem";
};
version = "1.13.6";
version = "1.13.8";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@ -944,10 +944,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem";
};
version = "2.0.4";
version = "2.0.5";
};
unicode-display_width = {
groups = ["default" "development" "test"];
@ -996,9 +996,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
type = "gem";
};
version = "2.5.4";
version = "2.6.0";
};
}

View File

@ -2,12 +2,12 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.9.0";
version = "14.10.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-TO0ZO7Hd/9J+801zPrelnAnJa/X0W9yR0Wphjh3TpaE=";
sha256 = "sha256-7uy7F4wK/4xz0PK9ZadaMjy3c+xUK9+YKaaEm5iFqUs=";
};
buildInputs = [ ruby ];

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.2.2";
version = "15.3.1";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-kZs0va/lVAxSYJ8W2bwLij6HjGg5ppE+eQY9lCsljCE=";
vendorSha256 = "sha256-fOAHv+/FiR/R0ohhluDig5zKH9ZkBABrr0aeFsT3U8M=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

View File

@ -2,25 +2,25 @@
source 'https://rubygems.org'
gem 'rails', '~> 6.1.4.7'
gem 'rails', '~> 6.1.6.1'
gem 'bootsnap', '~> 1.12.0', require: false
gem 'bootsnap', '~> 1.13.0', require: false
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.50.0'
gem 'view_component', '~> 2.61'
# Default values for AR models
gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.3.0'
gem 'pg', '~> 1.4.0'
gem 'rugged', '~> 1.2'
gem 'grape-path-helpers', '~> 1.7.0'
gem 'grape-path-helpers', '~> 1.7.1'
gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.10.0'
@ -39,8 +39,8 @@ gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
gem 'omniauth-alicloud', '~> 1.0.1'
gem 'omniauth-facebook', '~> 4.0.0'
@ -56,7 +56,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.19.0'
gem 'rack-oauth2', '~> 1.21.2'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
@ -78,7 +78,7 @@ gem 'u2f', '~> 0.2.1'
gem 'validates_hostname', '~> 1.0.11'
gem 'rubyzip', '~> 2.3.2', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.9'
gem 'acme-client', '~> 2.0'
# Browser detection
gem 'browser', '~> 4.2'
@ -168,10 +168,10 @@ gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
gem 'rouge', '~> 3.29.0'
gem 'truncato', '~> 0.7.11'
gem 'rouge', '~> 3.30.0'
gem 'truncato', '~> 0.7.12'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.13.6'
gem 'nokogiri', '~> 1.13.0'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -187,7 +187,7 @@ gem 'rack', '~> 2.2.4'
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 5.6.2', require: false
gem 'puma', '~> 5.6.4', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@ -237,7 +237,7 @@ gem 'redis', '~> 4.4.0'
gem 'connection_pool', '~> 2.0'
# Redis session store
gem 'redis-actionpack', '~> 5.2.0'
gem 'redis-actionpack', '~> 5.3.0'
# Discord integration
gem 'discordrb-webhooks', '~> 3.4', require: false
@ -262,7 +262,7 @@ gem 'asana', '~> 0.10.13'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
gem 'kubeclient', '~> 4.9.2'
gem 'kubeclient', '~> 4.9.3'
# Sanitize user input
gem 'sanitize', '~> 6.0'
@ -299,7 +299,7 @@ gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 2.1.0'
gem 'gitlab-license', '~> 2.2.1'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.6.0'
@ -317,7 +317,7 @@ gem 'pg_query', '~> 2.1.0'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.23.0'
gem 'gitlab-labkit', '~> 0.24.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@ -345,27 +345,25 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.0.0', require: false
gem 'lefthook', '~> 1.1.0', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.44.3', require: false
gem 'solargraph', '~> 0.45.0', require: false
gem 'letter_opener_web', '~> 2.0.0'
gem 'lookbook'
# Better errors handler
gem 'better_errors', '~> 2.9.0'
# thin instead webrick
gem 'thin', '~> 1.8.0'
gem 'sprite-factory', '~> 1.7'
end
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3'
gem 'bullet', '~> 7.0.2'
gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9'
gem 'pry-shell', '~> 0.5.0'
gem 'pry-shell', '~> 0.5.1'
gem 'awesome_print', require: false
@ -408,7 +406,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.4.3', require: false
gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
end
group :development, :test, :coverage do
@ -420,10 +418,7 @@ end
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
# Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
# resolved. For details, check discussion in
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
gem 'gitlab-license_finder', '~> 6.0', require: false
gem 'license_finder', '~> 7.0', require: false
end
group :test do
@ -437,6 +432,8 @@ group :test do
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142'
gem 'graphlyte', '~> 1.0.0'
gem 'shoulda-matchers', '~> 5.1.0', require: false
gem 'email_spec', '~> 2.2.0'
gem 'webmock', '~> 3.9.1'
@ -486,21 +483,21 @@ gem 'ssh_data', '~> 1.3'
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 15.1.0-rc1'
gem 'gitaly', '~> 15.3.0-rc3'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.42.0'
gem 'google-protobuf', '~> 3.19.0'
gem 'google-protobuf', '~> 3.21'
gem 'toml-rb', '~> 2.0'
# Feature toggles
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
gem 'flipper', '~> 0.25.0'
gem 'flipper-active_record', '~> 0.25.0'
gem 'flipper-active_support_cache_store', '~> 0.25.0'
gem 'unleash', '~> 3.2.2'
gem 'gitlab-experiment', '~> 0.7.1'
@ -536,9 +533,9 @@ gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.5.1'
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.13.19'
gem 'oj', '~> 3.13.20'
gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
gem 'webauthn', '~> 2.3'

View File

@ -24,6 +24,14 @@ PATH
connection_pool (~> 2.0)
mail (~> 2.7)
PATH
remote: omniauth-cas3
specs:
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
omniauth (~> 1.2, < 3)
PATH
remote: omniauth-gitlab
specs:
@ -43,65 +51,66 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
acme-client (2.0.9)
faraday (>= 0.17, < 2.0.0)
actioncable (6.1.4.7)
actionpack (= 6.1.4.7)
activesupport (= 6.1.4.7)
acme-client (2.0.11)
faraday (>= 1.0, < 3.0.0)
faraday-retry (~> 1.0)
actioncable (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.7)
actionpack (= 6.1.4.7)
activejob (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
actionmailbox (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
mail (>= 2.7.1)
actionmailer (6.1.4.7)
actionpack (= 6.1.4.7)
actionview (= 6.1.4.7)
activejob (= 6.1.4.7)
activesupport (= 6.1.4.7)
actionmailer (6.1.6.1)
actionpack (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activesupport (= 6.1.6.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.4.7)
actionview (= 6.1.4.7)
activesupport (= 6.1.4.7)
actionpack (6.1.6.1)
actionview (= 6.1.6.1)
activesupport (= 6.1.6.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.7)
actionpack (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
actiontext (6.1.6.1)
actionpack (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
nokogiri (>= 1.8.5)
actionview (6.1.4.7)
activesupport (= 6.1.4.7)
actionview (6.1.6.1)
activesupport (= 6.1.6.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.4.7)
activesupport (= 6.1.4.7)
activejob (6.1.6.1)
activesupport (= 6.1.6.1)
globalid (>= 0.3.6)
activemodel (6.1.4.7)
activesupport (= 6.1.4.7)
activerecord (6.1.4.7)
activemodel (= 6.1.4.7)
activesupport (= 6.1.4.7)
activemodel (6.1.6.1)
activesupport (= 6.1.6.1)
activerecord (6.1.6.1)
activemodel (= 6.1.6.1)
activesupport (= 6.1.6.1)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
activestorage (6.1.4.7)
actionpack (= 6.1.4.7)
activejob (= 6.1.4.7)
activerecord (= 6.1.4.7)
activesupport (= 6.1.4.7)
marcel (~> 1.0.0)
activestorage (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activesupport (= 6.1.6.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.4.7)
activesupport (6.1.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -184,14 +193,14 @@ GEM
rack (>= 0.9.0)
bindata (2.4.10)
binding_ninja (0.2.3)
bootsnap (1.12.0)
bootsnap (1.13.0)
msgpack (~> 1.2)
bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
browser (4.2.0)
builder (3.2.4)
bullet (6.1.3)
bullet (7.0.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundler-audit (0.7.0.1)
@ -257,7 +266,6 @@ GEM
git
css_parser (1.11.0)
addressable
daemons (1.3.1)
danger (8.6.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
@ -310,7 +318,7 @@ GEM
devise (~> 4.0)
railties (< 7.1)
rotp (~> 6.0)
diff-lcs (1.4.4)
diff-lcs (1.5.0)
diff_match_patch (0.1.0)
diffy (3.3.0)
discordrb-webhooks (3.4.2)
@ -373,7 +381,6 @@ GEM
tzinfo
ethon (0.15.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
excon (0.90.0)
execjs (2.8.1)
expression_parser (0.9.0)
@ -405,8 +412,8 @@ GEM
faraday-http-cache (2.4.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
@ -431,13 +438,13 @@ GEM
libyajl2 (~> 1.2)
filelock (1.1.1)
find_a_port (1.0.1)
flipper (0.21.0)
flipper-active_record (0.21.0)
activerecord (>= 5.0, < 7)
flipper (~> 0.21.0)
flipper-active_support_cache_store (0.21.0)
activesupport (>= 5.0, < 7)
flipper (~> 0.21.0)
flipper (0.25.0)
flipper-active_record (0.25.0)
activerecord (>= 4.2, < 8)
flipper (~> 0.25.0)
flipper-active_support_cache_store (0.25.0)
activesupport (>= 4.2, < 8)
flipper (~> 0.25.0)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@ -499,9 +506,9 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.7.0)
git (1.11.0)
rchardet (~> 1.8)
gitaly (15.1.0.pre.rc1)
gitaly (15.3.0.pre.rc3)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -509,7 +516,7 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.4.3)
gitlab-dangerfiles (3.5.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
@ -523,22 +530,15 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.23.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
gitlab-labkit (0.24.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 5.0.0)
gitlab-license (2.1.0)
gitlab-license_finder (6.14.2.1)
bundler
rubyzip (>= 1, < 3)
thor (~> 1.0)
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-license (2.2.1)
gitlab-mail_room (0.0.9)
gitlab-markup (1.8.0)
gitlab-net-dns (0.9.1)
@ -578,9 +578,9 @@ GEM
retriable (>= 2.0, < 4.0)
rexml
signet (~> 0.12)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.19.4)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-protobuf (3.21.3)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@ -602,7 +602,7 @@ GEM
grape-entity (0.10.0)
activesupport (>= 3.0.0)
multi_json (>= 1.3.2)
grape-path-helpers (1.7.0)
grape-path-helpers (1.7.1)
activesupport
grape (~> 1.3)
rake (> 12)
@ -617,6 +617,7 @@ GEM
faraday (>= 1.0)
faraday_middleware
graphql-client
graphlyte (1.0.0)
graphql (1.13.12)
graphql-client (0.17.0)
activesupport (>= 3.0)
@ -676,6 +677,7 @@ GEM
nokogiri (>= 1.4)
html2text (0.2.0)
nokogiri (~> 1.6)
htmlbeautifier (1.4.2)
htmlentities (4.3.4)
http (4.4.1)
addressable (~> 2.3)
@ -683,7 +685,7 @@ GEM
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
http-accept (1.7.0)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
http-parser (1.2.3)
@ -692,7 +694,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
icalendar (2.4.1)
@ -725,7 +727,7 @@ GEM
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jsonpath (1.1.0)
jsonpath (1.1.2)
multi_json
jwt (2.1.0)
kaminari (1.2.1)
@ -744,18 +746,18 @@ GEM
grpc (~> 1.0)
knapsack (1.21.1)
rake
kramdown (2.3.1)
kramdown (2.3.2)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
kubeclient (4.9.2)
kubeclient (4.9.3)
http (>= 3.0, < 5.0)
jsonpath (~> 1.0)
recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.0.2)
lefthook (1.1.0)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -764,13 +766,20 @@ GEM
railties (>= 5.2)
rexml
libyajl2 (1.2.0)
license_finder (7.0.1)
bundler
rubyzip (>= 1, < 3)
thor (~> 1.2)
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.9)
licensee (9.14.1)
dotenv (~> 2.0)
octokit (~> 4.17)
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
listen (3.6.0)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
locale (2.1.3)
@ -783,6 +792,15 @@ GEM
loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lookbook (0.9.3)
actioncable
htmlbeautifier (~> 1.3)
listen (~> 3.0)
railties (>= 5.0)
redcarpet (~> 3.5)
rouge (~> 3.26)
view_component (~> 2.0)
yard (~> 0.9.25)
lru_redux (1.1.0)
lumberjack (1.2.7)
mail (2.7.1)
@ -794,9 +812,9 @@ GEM
memoist (0.16.2)
memory_profiler (0.9.14)
method_source (1.0.0)
mime-types (3.3.1)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mime-types-data (3.2022.0105)
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.1.2)
@ -817,10 +835,10 @@ GEM
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6)
msgpack (1.5.2)
msgpack (1.5.4)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
multipart-post (2.2.3)
murmurhash3 (0.1.6)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
@ -838,7 +856,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
nokogiri (1.13.6)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
@ -853,9 +871,9 @@ GEM
rack (>= 1.2, < 3)
rash_alt (>= 0.4, < 1)
version_gem (~> 1.0)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (16.10.6)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
@ -869,7 +887,7 @@ GEM
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
oj (3.13.19)
oj (3.13.20)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@ -889,10 +907,6 @@ GEM
jwt (>= 1.0, < 3.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.4)
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
omniauth (~> 1.2)
omniauth-dingtalk-oauth2 (1.0.1)
omniauth-oauth2 (~> 1.7)
omniauth-facebook (4.0.0)
@ -973,7 +987,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.3.5)
pg (1.4.3)
pg_query (2.1.3)
google-protobuf (>= 3.19.2)
plist (3.6.0)
@ -1000,12 +1014,12 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-shell (0.5.0)
pry-shell (0.5.1)
pry (~> 0.13.0)
tty-markdown
tty-prompt
public_suffix (4.0.7)
puma (5.6.2)
puma (5.6.4)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
@ -1020,7 +1034,7 @@ GEM
rack (>= 1.0, < 3)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-oauth2 (1.19.0)
rack-oauth2 (1.21.2)
activesupport
attr_required
httpclient
@ -1031,20 +1045,20 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.6.0)
rails (6.1.4.7)
actioncable (= 6.1.4.7)
actionmailbox (= 6.1.4.7)
actionmailer (= 6.1.4.7)
actionpack (= 6.1.4.7)
actiontext (= 6.1.4.7)
actionview (= 6.1.4.7)
activejob (= 6.1.4.7)
activemodel (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
rails (6.1.6.1)
actioncable (= 6.1.6.1)
actionmailbox (= 6.1.6.1)
actionmailer (= 6.1.6.1)
actionpack (= 6.1.6.1)
actiontext (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activemodel (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
bundler (>= 1.15.0)
railties (= 6.1.4.7)
railties (= 6.1.6.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
@ -1053,23 +1067,23 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rails-i18n (7.0.3)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (6.1.4.7)
actionpack (= 6.1.4.7)
activesupport (= 6.1.4.7)
railties (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
method_source
rake (>= 0.13)
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
randexp (0.1.7)
rash_alt (0.4.12)
hashie (>= 3.4)
rb-fsevent (0.10.4)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbtrace (0.4.14)
@ -1083,17 +1097,18 @@ GEM
recaptcha (4.13.1)
json
recursive-open-struct (1.1.3)
redcarpet (3.5.1)
redis (4.4.0)
redis-actionpack (5.2.0)
actionpack (>= 5, < 7)
redis-actionpack (5.3.0)
actionpack (>= 5, < 8)
redis-rack (>= 2.1.0, < 3)
redis-store (>= 1.1.0, < 2)
redis-namespace (1.8.1)
redis (>= 3.0.4)
redis-rack (2.1.3)
redis-rack (2.1.4)
rack (>= 2.0.8, < 3)
redis-store (>= 1.2, < 2)
redis-store (1.9.0)
redis-store (1.9.1)
redis (>= 4, < 5)
regexp_parser (2.5.0)
regexp_property_values (1.0.0)
@ -1117,7 +1132,7 @@ GEM
rexml (3.2.5)
rinku (2.0.0)
rotp (6.2.0)
rouge (3.29.0)
rouge (3.30.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@ -1172,7 +1187,7 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.18.0)
rubocop-ast (1.19.1)
parser (>= 3.1.1.0)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
@ -1224,9 +1239,9 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.8.2)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
faraday (>= 0.17.3, < 3)
sd_notify (0.1.0)
securecompare (1.0.0)
seed-fu (2.3.7)
@ -1262,9 +1277,9 @@ GEM
fugit (~> 1.1)
sidekiq (>= 4.2.1)
sigdump (0.2.4)
signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
signet (0.17.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_po_parser (1.1.6)
@ -1281,7 +1296,7 @@ GEM
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
solargraph (0.44.3)
solargraph (0.45.0)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
@ -1348,10 +1363,6 @@ GEM
test_file_finder (0.1.4)
faraday (~> 1.0)
text (1.3.1)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.2.1)
thrift (0.14.0)
tilt (2.0.10)
@ -1373,7 +1384,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
truncato (0.7.11)
truncato (0.7.12)
htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0)
tty-color (0.6.0)
@ -1395,7 +1406,7 @@ GEM
tty-screen (0.8.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
u2f (0.2.1)
uber (0.1.0)
@ -1405,10 +1416,10 @@ GEM
rugged (>= 0.27, < 1.3)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
unicode_utils (1.4.0)
uniform_notifier (1.13.0)
uniform_notifier (1.16.0)
unleash (3.2.2)
murmurhash3 (~> 0.1.6)
unparser (0.6.0)
@ -1429,7 +1440,7 @@ GEM
activesupport (>= 3.0)
version_gem (1.0.0)
version_sorter (2.2.4)
view_component (2.50.0)
view_component (2.61.0)
activesupport (>= 5.0.0, < 8.0)
method_source (~> 1.0)
vmstat (2.3.0)
@ -1464,10 +1475,11 @@ GEM
wisper (2.0.1)
with_env (1.1.0)
wmi-lite (1.0.5)
xml-simple (1.1.5)
xml-simple (1.1.9)
rexml
xpath (3.2.0)
nokogiri (~> 1.8)
yajl-ruby (1.4.1)
yajl-ruby (1.4.3)
yard (0.9.26)
zeitwerk (2.6.0)
@ -1476,7 +1488,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
acme-client (~> 2.0, >= 2.0.9)
acme-client (~> 2.0)
activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 9.0)
addressable (~> 2.8)
@ -1501,10 +1513,10 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.0)
bootsnap (~> 1.12.0)
bootsnap (~> 1.13.0)
bootstrap_form (~> 4.2.0)
browser (~> 4.2)
bullet (~> 6.1.3)
bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
capybara (~> 3.35.3)
capybara-screenshot (~> 1.0.22)
@ -1545,9 +1557,9 @@ DEPENDENCIES
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
ffaker (~> 2.10)
flipper (~> 0.21.0)
flipper-active_record (~> 0.21.0)
flipper-active_support_cache_store (~> 0.21.0)
flipper (~> 0.25.0)
flipper-active_record (~> 0.25.0)
flipper-active_support_cache_store (~> 0.25.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.14)
@ -1561,15 +1573,14 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 15.1.0.pre.rc1)
gitaly (~> 15.3.0.pre.rc3)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.4.3)
gitlab-dangerfiles (~> 3.5.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.3.0)
gitlab-labkit (~> 0.23.0)
gitlab-license (~> 2.1.0)
gitlab-license_finder (~> 6.0)
gitlab-labkit (~> 0.24.0)
gitlab-license (~> 2.2.1)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0)
gitlab-net-dns (~> 0.9.1)
@ -1580,14 +1591,15 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
google-api-client (~> 0.33)
google-protobuf (~> 3.19.0)
google-protobuf (~> 3.21)
gpgme (~> 2.0.19)
grape (~> 1.5.2)
grape-entity (~> 0.10.0)
grape-path-helpers (~> 1.7.0)
grape-path-helpers (~> 1.7.1)
grape_logging (~> 1.8)
graphiql-rails (~> 1.8)
graphlient (~> 0.5.0)
graphlyte (~> 1.0.0)
graphql (~> 1.13.12)
graphql-docs (~> 2.1.0)
grpc (~> 1.42.0)
@ -1615,13 +1627,15 @@ DEPENDENCIES
kas-grpc (~> 0.0.2)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.9.2)
lefthook (~> 1.0.0)
kubeclient (~> 4.9.3)
lefthook (~> 1.1.0)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.14.1)
lockbox (~> 0.6.2)
lograge (~> 0.5)
loofah (~> 2.18.0)
lookbook
lru_redux
mail (= 2.7.1)
mail-smtp_pool (~> 0.1.0)!
@ -1633,11 +1647,11 @@ DEPENDENCIES
multi_json (~> 1.14.1)
net-ldap (~> 0.16.3)
net-ntp
nokogiri (~> 1.13.6)
nokogiri (~> 1.13.0)
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 16.10)
oj (~> 3.13.19)
oj (~> 3.13.20)
omniauth (~> 1.8)
omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
@ -1645,7 +1659,7 @@ DEPENDENCIES
omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 1.0)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-cas3 (~> 1.1.4)!
omniauth-dingtalk-oauth2 (~> 1.0)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.4)
@ -1662,23 +1676,23 @@ DEPENDENCIES
parallel (~> 1.19)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.3.0)
pg (~> 1.4.0)
pg_query (~> 2.1.0)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.16)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.5.0)
puma (~> 5.6.2)
pry-shell (~> 0.5.1)
puma (~> 5.6.4)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.4)
rack-attack (~> 6.6.0)
rack-cors (~> 1.1.0)
rack-oauth2 (~> 1.19.0)
rack-oauth2 (~> 1.21.2)
rack-proxy (~> 0.7.2)
rack-timeout (~> 0.6.0)
rails (~> 6.1.4.7)
rails (~> 6.1.6.1)
rails-controller-testing
rails-i18n (~> 7.0)
rainbow (~> 3.0)
@ -1687,13 +1701,13 @@ DEPENDENCIES
re2 (~> 1.4.0)
recaptcha (~> 4.11)
redis (~> 4.4.0)
redis-actionpack (~> 5.2.0)
redis-actionpack (~> 5.3.0)
redis-namespace (~> 1.8.1)
request_store (~> 1.5)
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.2.5)
rouge (~> 3.29.0)
rouge (~> 3.30.0)
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
rspec-parameterized
@ -1730,7 +1744,7 @@ DEPENDENCIES
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1)
solargraph (~> 0.44.3)
solargraph (~> 0.45.0)
spamcheck (~> 0.1.0)
spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4)
@ -1744,12 +1758,11 @@ DEPENDENCIES
terser (= 1.0.2)
test-prof (~> 1.0.7)
test_file_finder (~> 0.1.3)
thin (~> 1.8.0)
thrift (>= 0.14.0)
timecop (~> 0.9.1)
timfel-krb5-auth (~> 0.8)
toml-rb (~> 2.0)
truncato (~> 0.7.11)
truncato (~> 0.7.12)
typhoeus (~> 1.4.0)
u2f (~> 0.2.1)
undercover (~> 0.4.4)
@ -1758,14 +1771,14 @@ DEPENDENCIES
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4)
view_component (~> 2.50.0)
view_component (~> 2.61)
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 2.3)
webmock (~> 3.9.1)
webrick (~> 1.6.1)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.1)
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.3.15

View File

@ -1,25 +1,25 @@
{
acme-client = {
dependencies = ["faraday"];
dependencies = ["faraday" "faraday-retry"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c4g3rl1bvcb8frh5061hwaxkxglkj8i888j5gww5qapn5sp2czq";
sha256 = "1pl901hwqbx7sa058i006l7addvqg6wv73kkqsq3mgjx7jgxmxpd";
type = "gem";
};
version = "2.0.9";
version = "2.0.11";
};
actioncable = {
dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"];
groups = ["default" "test"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0knrmrqmjl4gdzvmxk5plc9i5ipclncg7l0l0yhvy07779j3xqpd";
sha256 = "06wn3yiada1hxnhnq6ww118k6xckrkh9m9z4h5l04cph3ha7kw0i";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ksps8lzmggdhbr0d45qyp2s70kfapx1x0j77xmacw9c749y5jxd";
sha256 = "1lh3dmr84jw0ihqdgqy7758gd12v1pr4pz394vif97accgz1dk54";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa";
sha256 = "19qjvs621hrvgyv08wsc80fv39402fvsxdsc602xgvvm9bzlp5hk";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";
sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dwinzhsfcysz9khk137z92qr5kx6aw5f2ybkdjk1yqml8avv1wd";
sha256 = "1h7s384cvzd4rz4k653gwjvxlb1b4cxn2kz7q3rvvx5nd5kvj9pz";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";
sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj";
sha256 = "0rfvn1m7c21fm5hq6262a76snaja9mb0jfl47fvsmaiikm4y9zly";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activemodel = {
dependencies = ["activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv";
sha256 = "1qm3whcaiv5kkgp6plyxi6xa6n3sap18m6w1lfwvr93xb8v57693";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l";
sha256 = "1c6hcy2affwkkggd49v1g1j6ahijikbcxrcksngm9silmc24ixw2";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activerecord-explain-analyze = {
dependencies = ["activerecord" "pg"];
@ -126,10 +126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18gxckrydsyciaiq5j981sf522kfqpq74yvf405dgn688y5927il";
sha256 = "1idgd8r1hlkih8kyfn38z7kxqnr40s7as130cwa6x939b8slrgrz";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -137,10 +137,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";
sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@ -577,10 +577,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc";
sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6";
type = "gem";
};
version = "1.12.0";
version = "1.13.0";
};
bootstrap_form = {
dependencies = ["actionpack" "activemodel"];
@ -619,10 +619,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04wm807czdixpgnqp446vj8vc7dj96k26p90rmwll9ahlib37mmm";
sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab";
type = "gem";
};
version = "6.1.3";
version = "7.0.2";
};
bundler-audit = {
dependencies = ["thor"];
@ -935,16 +935,6 @@
};
version = "1.11.0";
};
daemons = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
type = "gem";
};
version = "1.3.1";
};
danger = {
dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
groups = ["danger" "default" "development" "test"];
@ -1098,10 +1088,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
type = "gem";
};
version = "1.4.4";
version = "1.5.0";
};
diff_match_patch = {
groups = ["default"];
@ -1420,16 +1410,6 @@
};
version = "0.15.0";
};
eventmachine = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.7";
};
excon = {
groups = ["default"];
platforms = [];
@ -1572,10 +1552,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
type = "gem";
};
version = "1.0.3";
version = "1.0.4";
};
faraday-net_http = {
groups = ["danger" "default" "development" "test"];
@ -1747,10 +1727,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00qjmmy4lx6cbyndpqgj330ys6pxi3chhqfaybd5c7m9y0kr6ck9";
sha256 = "1pbsd7p9aij9ffw621wl841hj319vv677n69jk4qndxqa9kpgcnc";
type = "gem";
};
version = "0.21.0";
version = "0.25.0";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
@ -1758,10 +1738,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06j6fg8qdxklml0qvindy8dghx3ilq2k3x5rwdxlr8vjl5hljqm5";
sha256 = "0zxn7qp16xwk289xa3f8sqy4dg8difcsjc8rx44nmk72cnack9c5";
type = "gem";
};
version = "0.21.0";
version = "0.25.0";
};
flipper-active_support_cache_store = {
dependencies = ["activesupport" "flipper"];
@ -1769,10 +1749,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00rb87d1f7wl1n3idv8bvjv45v3j1n1j5wm2vswisayv7z8wqp6r";
sha256 = "06skgdfb43g6i40b5rx61yqgq16wwd8knvswnrva1l889fcvz0kj";
type = "gem";
};
version = "0.21.0";
version = "0.25.0";
};
flowdock = {
dependencies = ["httparty" "multi_json"];
@ -1982,14 +1962,14 @@
};
git = {
dependencies = ["rchardet"];
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y8n1m2kys3q79b9kp8bs4803isshpf0f401a2hfy4iyh5jwzx11";
sha256 = "1wd0rvz6cybqm9svcx427hgpcz804am64s0sxxrh72i9m16vm5by";
type = "gem";
};
version = "1.7.0";
version = "1.11.0";
};
gitaly = {
dependencies = ["grpc"];
@ -1997,10 +1977,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z";
sha256 = "0nvlnfjv5fycndri3bfbs7fsgb3cndgl3hhckiq7428yz58jgvg0";
type = "gem";
};
version = "15.1.0.pre.rc1";
version = "15.3.0.pre.rc3";
};
github-markup = {
groups = ["default"];
@ -2040,10 +2020,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06jfkak5z7jj1g8vy8ljnxradk111phg41f8p6ays4ckfrimkvm4";
sha256 = "18cs97r8msg2cvrvz9jfp6gn02xm80y4r14y7f5xpmg4k9j6ywqj";
type = "gem";
};
version = "3.4.3";
version = "3.5.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@ -2073,31 +2053,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l";
sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg";
type = "gem";
};
version = "0.23.0";
version = "0.24.0";
};
gitlab-license = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ys98a5qwih4l9zllsysd48d7jl5qcw2ralav0hab3lxalmy5pwf";
sha256 = "0c1dy32ai104nh7npxbzjdfpr2yhx2xdrd81zs5dz1r8ifzgdz1r";
type = "gem";
};
version = "2.1.0";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
groups = ["development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fzrv96kbzyqnsdj762x7n0y006rsgsi8k23nad4xsa43d065i71";
type = "gem";
};
version = "6.14.2.1";
version = "2.2.1";
};
gitlab-mail_room = {
groups = ["default"];
@ -2223,20 +2192,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q0aknwpr8k1v92qcm1rz1zyrgdpf1i1b9mxa1gi48y0aawlnb7j";
sha256 = "0825yplkfp8xf0vpl25ff58xrlah98x9yv3hj9pgl82b0gqali6p";
type = "gem";
};
version = "3.19.4";
version = "3.21.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -2299,10 +2268,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r9p47kcf1j56pd0zijakcqp1mi5563z3i2kkbhx2pc3y95zca6d";
sha256 = "1ql1acy68n9xkvjzda1vpscf20zqqwjm959b7cx3w1yl40d2f9rf";
type = "gem";
};
version = "1.7.0";
version = "1.7.1";
};
grape_logging = {
dependencies = ["grape" "rack"];
@ -2337,6 +2306,16 @@
};
version = "0.5.0";
};
graphlyte = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kc0l67n5zlpwbnb8nrr27nm4fzpb7qih77a00grcvnygnv4mbxm";
type = "gem";
};
version = "1.0.0";
};
graphql = {
groups = ["default" "development" "test"];
platforms = [];
@ -2551,6 +2530,16 @@
};
version = "0.2.0";
};
htmlbeautifier = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y55dx25l3wwc025mwl6jsbcsqrm30gs2d2pxnaxg07yh22ckq4x";
type = "gem";
};
version = "1.4.2";
};
htmlentities = {
groups = ["default" "test"];
platforms = [];
@ -2588,10 +2577,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
http-form_data = {
groups = ["default"];
@ -2641,10 +2630,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
version = "1.10.0";
version = "1.12.0";
};
i18n_data = {
groups = ["default"];
@ -2789,10 +2778,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq";
sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138";
type = "gem";
};
version = "1.1.0";
version = "1.1.2";
};
jwt = {
groups = ["default"];
@ -2875,10 +2864,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar";
sha256 = "0757lqaq593z8hzdv98nai73ag384dkk7jgj3mcq2r6ix7130ifb";
type = "gem";
};
version = "2.3.1";
version = "2.3.2";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@ -2897,10 +2886,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4";
sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym";
type = "gem";
};
version = "4.9.2";
version = "4.9.3";
};
launchy = {
dependencies = ["addressable"];
@ -2918,10 +2907,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zmg1kl5fh38gs4nj6mbj1rg61jg1iwplciq7n0qml5jckm75fpd";
sha256 = "0mvyr9wqgv3pp75wg8majkivzrd0imkvq5f62p1ndzm09lnv6z05";
type = "gem";
};
version = "1.0.2";
version = "1.1.0";
};
letter_opener = {
dependencies = ["launchy"];
@ -2955,6 +2944,17 @@
};
version = "1.2.0";
};
license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
groups = ["development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb";
type = "gem";
};
version = "7.0.1";
};
licensee = {
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
groups = ["default"];
@ -2968,14 +2968,14 @@
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
groups = ["default" "test"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh";
sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
type = "gem";
};
version = "3.6.0";
version = "3.7.1";
};
locale = {
groups = ["default" "development"];
@ -3019,6 +3019,17 @@
};
version = "2.18.0";
};
lookbook = {
dependencies = ["actioncable" "htmlbeautifier" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ycj1wa1qfxiz2g2i8lqmzfhrl82n2sh6242gyp5vdzhqqyaf6yz";
type = "gem";
};
version = "0.9.3";
};
lru_redux = {
groups = ["default"];
platforms = [];
@ -3107,24 +3118,24 @@
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
type = "gem";
};
version = "3.3.1";
version = "3.4.1";
};
mime-types-data = {
groups = ["default"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
type = "gem";
};
version = "3.2020.0512";
version = "3.2022.0105";
};
mini_histogram = {
groups = ["default" "test"];
@ -3245,10 +3256,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy";
sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5";
type = "gem";
};
version = "1.5.2";
version = "1.5.4";
};
multi_json = {
groups = ["default"];
@ -3271,14 +3282,14 @@
version = "0.6.0";
};
multipart-post = {
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
type = "gem";
};
version = "2.1.1";
version = "2.2.3";
};
murmurhash3 = {
groups = ["default"];
@ -3420,10 +3431,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr";
type = "gem";
};
version = "1.13.6";
version = "1.13.8";
};
notiffany = {
dependencies = ["nenv" "shellany"];
@ -3469,14 +3480,14 @@
};
octokit = {
dependencies = ["faraday" "sawyer"];
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860";
type = "gem";
};
version = "4.20.0";
version = "4.25.1";
};
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
@ -3494,10 +3505,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b10apyzm1qyph42438z9nx2ln5v9sg0686ws9gdrv5wh482fnmf";
sha256 = "1iiavwlx9k3v9vyj2pswnc88vmn60prrg8dnsrpg4iglh40da64m";
type = "gem";
};
version = "3.13.19";
version = "3.13.20";
};
omniauth = {
dependencies = ["hashie" "rack"];
@ -3576,17 +3587,6 @@
};
version = "0.0.10";
};
omniauth-cas3 = {
dependencies = ["addressable" "nokogiri" "omniauth"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx";
type = "gem";
};
version = "1.1.4";
};
omniauth-dingtalk-oauth2 = {
dependencies = ["omniauth-oauth2"];
groups = ["default"];
@ -3891,10 +3891,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6";
sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb";
type = "gem";
};
version = "1.3.5";
version = "1.4.3";
};
pg_query = {
dependencies = ["google-protobuf"];
@ -4024,10 +4024,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jn3f5d9h2kg3hc4q7nzxfian4bhs23hh8n6g6hm9nzxqqbh9448";
sha256 = "0zb7mfj07vafp2h3ixz0v5lw1drl379m7yjmdzbgbb3p0vih141b";
type = "gem";
};
version = "0.5.0";
version = "0.5.1";
};
public_suffix = {
groups = ["danger" "default" "development" "test"];
@ -4045,10 +4045,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
type = "gem";
};
version = "5.6.2";
version = "5.6.4";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
@ -4140,10 +4140,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw";
sha256 = "1wiz38c155g236sgrw0qnn33ysjmqhwq3hc1hqfw2fi4mmy1bz06";
type = "gem";
};
version = "1.19.0";
version = "1.21.2";
};
rack-proxy = {
dependencies = ["rack"];
@ -4183,10 +4183,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kwpw06ylmjbfldqjzhy5m6chr6q6g0gm6p6h98sbjj8awri72n5";
sha256 = "11injrn9khwkw3ydb4lbgabi5fznml32nm44ym0v6gwilchlj0hp";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -4216,10 +4216,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
type = "gem";
};
version = "1.4.2";
version = "1.4.3";
};
rails-i18n = {
dependencies = ["i18n" "railties"];
@ -4238,10 +4238,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd";
sha256 = "0cwpjj9inak65cvs9wyhpjdsx1xajzbiy25p397a8kmyvkrcvzms";
type = "gem";
};
version = "6.1.4.7";
version = "6.1.6.1";
};
rainbow = {
groups = ["coverage" "default" "development" "test"];
@ -4289,10 +4289,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm";
type = "gem";
};
version = "0.10.4";
version = "0.11.1";
};
rb-inotify = {
dependencies = ["ffi"];
@ -4377,6 +4377,16 @@
};
version = "1.1.3";
};
redcarpet = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
type = "gem";
};
version = "3.5.1";
};
RedCloth = {
groups = ["default"];
platforms = [];
@ -4403,10 +4413,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3";
sha256 = "0h4iq67p5jjkg9kny7ki6yzkivyakmhbp6ckkhl6mlnriw5avc9z";
type = "gem";
};
version = "5.2.0";
version = "5.3.0";
};
redis-namespace = {
dependencies = ["redis"];
@ -4425,10 +4435,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nblbxg1f051dn83jp92lz3lc1wxm18nviglrabv2l0vz6rd0pkb";
sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8";
type = "gem";
};
version = "2.1.3";
version = "2.1.4";
};
redis-store = {
dependencies = ["redis"];
@ -4436,10 +4446,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cpzbf2svnk4j5awb24ncl0mih45zkbdrd7q23jdg1r8k3q7mdg6";
sha256 = "0787fwmlvpx5k360dxlcs8r7vijgl2iyvh3zyvl7qyvgshw78k3v";
type = "gem";
};
version = "1.9.0";
version = "1.9.1";
};
regexp_parser = {
groups = ["default" "development" "test"];
@ -4561,10 +4571,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r";
sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3";
type = "gem";
};
version = "3.29.0";
version = "3.30.0";
};
rqrcode = {
dependencies = ["chunky_png"];
@ -4725,10 +4735,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl";
sha256 = "0h8q3gwqs8afshjd2l52ywf48md9rskr3q2y4fydgm536vvahjgm";
type = "gem";
};
version = "1.18.0";
version = "1.19.1";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@ -4987,14 +4997,14 @@
};
sawyer = {
dependencies = ["addressable" "faraday"];
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
type = "gem";
};
version = "0.8.2";
version = "0.9.2";
};
sd_notify = {
groups = ["puma"];
@ -5182,10 +5192,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x";
type = "gem";
};
version = "0.14.0";
version = "0.17.0";
};
simple_po_parser = {
groups = ["development" "test"];
@ -5286,10 +5296,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h3i4fkn028ylhgbqac0bgpbbikjcd5ks7id8wm94ahnq89z4mh8";
sha256 = "11c7hcgg4sflhlj9lv9yh76sxrlk9a52y6p56xc99f0w015yyslh";
type = "gem";
};
version = "0.44.3";
version = "0.45.0";
};
sorted_set = {
dependencies = ["rbtree" "set"];
@ -5585,17 +5595,6 @@
};
version = "1.3.1";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
type = "gem";
};
version = "1.8.0";
};
thor = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
@ -5716,10 +5715,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
sha256 = "0k4wdj2l6p4ax4y6qxbywkglmbhvfs4j1k868nkd2px39yhfingy";
type = "gem";
};
version = "0.7.11";
version = "0.7.12";
};
tty-color = {
groups = ["default" "development" "test"];
@ -5801,10 +5800,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem";
};
version = "2.0.4";
version = "2.0.5";
};
u2f = {
groups = ["default"];
@ -5853,10 +5852,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
type = "gem";
};
version = "0.0.8";
version = "0.0.8.2";
};
unicode-display_width = {
groups = ["danger" "default" "development" "test"];
@ -5883,10 +5882,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c";
sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr";
type = "gem";
};
version = "1.13.0";
version = "1.16.0";
};
unleash = {
dependencies = ["murmurhash3"];
@ -5986,14 +5985,14 @@
};
view_component = {
dependencies = ["activesupport" "method_source"];
groups = ["default"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1syhbmnrqklahqaaac13jx6rwpc6z210f53apwglngp2xdibxkf1";
sha256 = "03my3glfw0v9g2zlwp1wad74v5n2pgz8hai8kj1n9by06vwr32v0";
type = "gem";
};
version = "2.50.0";
version = "2.61.0";
};
vmstat = {
groups = ["default"];
@ -6132,14 +6131,15 @@
version = "1.0.5";
};
xml-simple = {
groups = ["default" "development" "test"];
dependencies = ["rexml"];
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj";
type = "gem";
};
version = "1.1.5";
version = "1.1.9";
};
xpath = {
dependencies = ["nokogiri"];
@ -6157,10 +6157,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc";
type = "gem";
};
version = "1.4.1";
version = "1.4.3";
};
yard = {
groups = ["default" "development"];

View File

@ -0,0 +1,13 @@
diff --git a/Gemfile.lock b/Gemfile.lock
index f04445e1d..b9bf34cd0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -987,7 +987,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
- pg (1.4.1)
+ pg (1.4.3)
pg_query (2.1.3)
google-protobuf (>= 3.19.2)
plist (3.6.0)

View File

@ -17,7 +17,7 @@ import requests
# Always keep this in sync with the GitLaab version you're updating to.
# If you see any errors about vendored dependencies during an update, check the Gemfile.
VENDORED_GEMS = ['devise-pbkdf2-encryptable', 'omniauth-gitlab', 'omniauth_crowd', 'mail-smtp_pool', 'ipynbdiff', 'error_tracking_open_api']
VENDORED_GEMS = ['devise-pbkdf2-encryptable', 'omniauth-cas3', 'omniauth-gitlab', 'omniauth_crowd', 'mail-smtp_pool', 'ipynbdiff', 'error_tracking_open_api']
logger = logging.getLogger(__name__)
@ -146,6 +146,11 @@ def update_rubyenv():
gemfile = repo.get_file('Gemfile', rev)
gemfile_lock = repo.get_file('Gemfile.lock', rev)
if "pg (1.4.1)" in gemfile_lock:
gemfile_lock = gemfile_lock.replace("pg (1.4.1)", "pg (1.4.3)")
else:
logger.info("Looks like pg was updated! Please remove update-pg.patch, as this will cause a build failure")
with open(rubyenv_dir / 'Gemfile', 'w') as f:
f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile))

View File

@ -65,6 +65,8 @@
# E Max relative difference: 255.
[
"test_Text2Color"
"test_PointCloudDot"
"test_Torus"
] ++
# failing with:

View File

@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ];
postPatch = "sed -i -e s,@NDI@,${ndi},g src/obs-ndi.cpp";
postPatch = ''
# Add path (variable added in hardcode-ndi-path.patch)
sed -i -e s,@NDI@,${ndi},g src/obs-ndi.cpp
# Replace bundled NDI SDK with the upstream version
# (This fixes soname issues)
rm -rf lib/ndi
ln -s ${ndi}/include lib/ndi
'';
cmakeFlags = [
"-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs"

View File

@ -1,4 +1,4 @@
{ stdenv, lib, edk2, util-linux, nasm, acpica-tools
{ stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools
, csmSupport ? false, seabios ? null
, secureBoot ? false
, httpSupport ? false
@ -19,9 +19,15 @@ let
throw "Unsupported architecture";
version = lib.getVersion edk2;
suffixes = {
x86_64 = "FV/OVMF";
aarch64 = "FV/AAVMF";
};
in
edk2.mkDerivation projectDscPath {
edk2.mkDerivation projectDscPath (finalAttrs: {
pname = "OVMF";
inherit version;
@ -62,10 +68,23 @@ edk2.mkDerivation projectDscPath {
dontPatchELF = true;
passthru =
let
cpuName = stdenv.hostPlatform.parsed.cpu.name;
suffix = suffixes."${cpuName}" or (throw "Host cpu name `${cpuName}` is not supported in this OVMF derivation!");
prefix = "${finalAttrs.finalPackage.fd}/${suffix}";
in {
firmware = "${prefix}_CODE.fd";
variables = "${prefix}_VARS.fd";
# This will test the EFI firmware for the host platform as part of the NixOS Tests setup.
tests.basic-systemd-boot = nixosTests.systemd-boot.basic;
};
meta = {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
license = lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"];
maintainers = [ lib.maintainers.raitobezarius ];
};
}
})

View File

@ -87,7 +87,11 @@ edk2 = buildStdenv.mkDerivation {
};
passthru = {
mkDerivation = projectDscPath: attrs: buildStdenv.mkDerivation ({
mkDerivation = projectDscPath: attrsOrFun: buildStdenv.mkDerivation (finalAttrs:
let
attrs = lib.toFunction attrsOrFun finalAttrs;
in
{
inherit (edk2) src;
depsBuildBuild = [ buildPackages.stdenv.cc ] ++ attrs.depsBuildBuild or [];

View File

@ -1,52 +0,0 @@
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3
https://gcc.gnu.org/PR106102
--- a/gcc/cp/mapper-client.cc
+++ b/gcc/cp/mapper-client.cc
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#define INCLUDE_MAP
+#define INCLUDE_MEMORY
#include "system.h"
#include "line-map.h"
--- a/gcc/cp/mapper-resolver.cc
+++ b/gcc/cp/mapper-resolver.cc
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
#define INCLUDE_VECTOR
#define INCLUDE_ALGORITHM
#define INCLUDE_MAP
+#define INCLUDE_MEMORY
#include "system.h"
// We don't want or need to be aware of networking
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -206,6 +206,7 @@ Classes used:
#define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */
#include "config.h"
+#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
--- a/libcc1/libcc1plugin.cc
+++ b/libcc1/libcc1plugin.cc
@@ -31,6 +31,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
+#define INCLUDE_MEMORY
#include "gcc-plugin.h"
#include "system.h"
#include "coretypes.h"
--- a/libcc1/libcp1plugin.cc
+++ b/libcc1/libcp1plugin.cc
@@ -32,6 +32,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
+#define INCLUDE_MEMORY
#include "gcc-plugin.h"
#include "system.h"
#include "coretypes.h"

View File

@ -1,67 +0,0 @@
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=49d508065bdd36fb1a9b6aad9666b1edb5e06474
https://gcc.gnu.org/PR106102
--- a/gcc/jit/jit-playback.cc
+++ b/gcc/jit/jit-playback.cc
@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
+#define INCLUDE_PTHREAD_H
#include "system.h"
#include "coretypes.h"
#include "target.h"
@@ -41,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "stmt.h"
-#include <pthread.h>
-
#include "jit-playback.h"
#include "jit-result.h"
#include "jit-builtins.h"
--- a/gcc/jit/jit-recording.cc
+++ b/gcc/jit/jit-recording.cc
@@ -19,13 +19,13 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
+#define INCLUDE_PTHREAD_H
#include "system.h"
#include "coretypes.h"
#include "tm.h"
#include "pretty-print.h"
#include "toplev.h"
-#include <pthread.h>
#include "jit-builtins.h"
#include "jit-recording.h"
--- a/gcc/jit/libgccjit.cc
+++ b/gcc/jit/libgccjit.cc
@@ -19,12 +19,12 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
+#define INCLUDE_PTHREAD_H
#include "system.h"
#include "coretypes.h"
#include "timevar.h"
#include "typed-splay-tree.h"
#include "cppbuiltin.h"
-#include <pthread.h>
#include "libgccjit.h"
#include "jit-recording.h"
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
#endif
#endif
+#ifdef INCLUDE_PTHREAD_H
+#include <pthread.h>
+#endif
+
#ifdef INCLUDE_ISL
#ifdef HAVE_isl
#include <isl/options.h>

View File

@ -54,7 +54,7 @@ with lib;
with builtins;
let majorVersion = "12";
version = "${majorVersion}.1.0";
version = "${majorVersion}.2.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -66,12 +66,12 @@ let majorVersion = "12";
../gnat-cflags-11.patch
../gcc-12-gfortran-driving.patch
../ppc-musl.patch
# Backports. Should be removed with 12.2.0 release:
./PR106102-musl-poison-cpp.patch
./PR106102-musl-poison-jit.patch
] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch {
url = "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff";
sha256 = "sha256-IcCYHSCAElJqTAZELJnRRWo0/SlkgQzSvoMjYr3pgD0=";
# TODO: switch back to Homebrew patches:
# was "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff"
name = "gcc-12-darwin-aarch64-support.patch";
url = "https://github.com/tjni/gcc-12-branch/compare/releases/gcc-12.2...gcc-12-2-darwin.diff";
sha256 = "sha256-hjM9q6tsdzoGOQWJ7v3BaeVxdWQGTaEnep2ZSwX5+74=";
})
++ optional langD ../libphobos.patch
@ -93,7 +93,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "sha256-Yv1jSInzHAK2SvLEaPBktHrRynhBHEWr5qxLX43RnHs=";
sha256 = "sha256-5UnPnPNZSgDie2WJ1DItcOByDN0hPzm+tBgeBpJiMP8=";
};
inherit patches;

View File

@ -1,15 +1,19 @@
{ lib, stdenv, requireFile, avahi }:
{ lib, stdenv, requireFile, avahi, obs-studio-plugins }:
let
versionJSON = builtins.fromJSON (builtins.readFile ./version.json);
in
stdenv.mkDerivation rec {
pname = "ndi";
fullVersion = "4.6.2";
version = builtins.head (builtins.splitVersion fullVersion);
version = versionJSON.version;
majorVersion = builtins.head (builtins.splitVersion version);
installerName = "Install_NDI_SDK_v${majorVersion}_Linux";
src = requireFile rec {
name = "InstallNDISDK_v${version}_Linux.tar.gz";
sha256 = "181ypfj1bl0kljzrfr6037i14ykg2y4plkzdhym6m3z7kcrnm1fl";
name = "${installerName}.tar.gz";
sha256 = versionJSON.hash;
message = ''
In order to use NDI SDK version ${fullVersion}, you need to comply with
In order to use NDI SDK version ${version}, you need to comply with
NewTek's license and download the appropriate Linux tarball from:
${meta.homepage}
@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
unpackPhase = ''
unpackFile ${src}
echo y | ./InstallNDISDK_v4_Linux.sh
echo y | ./${installerName}.sh
sourceRoot="NDI SDK for Linux";
'';
@ -51,6 +55,11 @@ stdenv.mkDerivation rec {
# Stripping breaks ndi-record.
dontStrip = true;
passthru.tests = {
inherit (obs-studio-plugins) obs-ndi;
};
passthru.updateScript = ./update.py;
meta = with lib; {
homepage = "https://ndi.tv/sdk/";
description = "NDI Software Developer Kit";

View File

@ -0,0 +1,77 @@
#!/usr/bin/env nix-shell
#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ ps.absl-py ps.requests ])"
import hashlib
import io
import json
import os.path
import tarfile
import requests
from absl import app, flags
BASE_NAME = "Install_NDI_SDK_v5_Linux"
NDI_SDK_URL = f"https://downloads.ndi.tv/SDK/NDI_SDK_Linux/{BASE_NAME}.tar.gz"
NDI_EXEC = f"{BASE_NAME}.sh"
NDI_ARCHIVE_MAGIC = b"__NDI_ARCHIVE_BEGIN__\n"
FLAG_out = flags.DEFINE_string("out", None, "Path to read/write version.json from/to.")
def find_version_json() -> str:
if FLAG_out.value:
return FLAG_out.value
try_paths = ["pkgs/development/libraries/ndi/version.json", "version.json"]
for path in try_paths:
if os.path.exists(path):
return path
raise Exception(
"Couldn't figure out where to write version.json; try specifying --out"
)
def fetch_tarball() -> bytes:
r = requests.get(NDI_SDK_URL)
r.raise_for_status()
return r.content
def read_version(tarball: bytes) -> str:
# Find the inner script.
outer_tarfile = tarfile.open(fileobj=io.BytesIO(tarball), mode="r:gz")
eula_script = outer_tarfile.extractfile(NDI_EXEC).read()
# Now find the archive embedded within the script.
archive_start = eula_script.find(NDI_ARCHIVE_MAGIC) + len(NDI_ARCHIVE_MAGIC)
inner_tarfile = tarfile.open(
fileobj=io.BytesIO(eula_script[archive_start:]), mode="r:gz"
)
# Now find Version.txt...
version_txt = (
inner_tarfile.extractfile("NDI SDK for Linux/Version.txt")
.read()
.decode("utf-8")
)
_, _, version = version_txt.strip().partition(" v")
return version
def main(argv):
tarball = fetch_tarball()
sha256 = hashlib.sha256(tarball).hexdigest()
version = {
"hash": f"sha256:{sha256}",
"version": read_version(tarball),
}
out_path = find_version_json()
with open(out_path, "w") as f:
json.dump(version, f)
f.write("\n")
if __name__ == "__main__":
app.run(main)

View File

@ -0,0 +1 @@
{"hash": "sha256:24ed671e140ee62ebe96a494b3f0e3a3e5ba005364a0a6ad8ebf89b3494b7644", "version": "5.5.1"}

View File

@ -0,0 +1,25 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja }:
stdenv.mkDerivation rec {
pname = "nng";
version = "1.5.2";
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nng";
rev = "v${version}";
sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k=";
};
nativeBuildInputs = [ cmake ninja ];
cmakeFlags = [ "-G Ninja" ];
meta = with lib; {
homepage = "https://nng.nanomsg.org/";
description = "Nanomsg next generation";
license = licenses.mit;
mainProgram = "nngcat";
platforms = platforms.unix;
};
}

View File

@ -234,6 +234,7 @@
, "npm-merge-driver"
, "nrm"
, "ocaml-language-server"
, "orval"
, "parcel-bundler"
, "parcel"
, "parsoid"

File diff suppressed because it is too large Load Diff

View File

@ -4,30 +4,40 @@
, lark
, pydot
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "amarna";
version = "0.1.2";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "crytic";
repo = "amarna";
rev = "v${version}";
sha256 = "sha256-ohR6VJFIvUCMkppqdCV/kJwEmh1fP0QhfQfNu3RoMeU=";
hash = "sha256-cE7OhACLpRmbJWzMsGTidbbw9FOKBbz47LEJwTW6wck=";
};
propagatedBuildInputs = [
lark
pydot
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "amarna" ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"amarna"
];
meta = with lib; {
description = "Amarna is a static-analyzer and linter for the Cairo programming language.";
description = "Static-analyzer and linter for the Cairo programming language";
homepage = "https://github.com/crytic/amarna";
license = licenses.agpl3;
license = licenses.agpl3Only;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "0.2.2";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-p1ySTp+/gMUo8XWox2s+M7ees6GlxpGCZxNNEJpQbj8=";
hash = "sha256-gWMqYvBKcGlLqbsZ4Hb+LCg0ywIokZwqiMXoD3rJ1MI=";
};
nativeBuildInputs = [

View File

@ -50,20 +50,8 @@ buildPythonPackage rec {
disabledTests = [
# Tests check for flake8
"file_does_not_exist"
# AssertionError: assert '.c { color:...
"test_style_defs"
# uses pytest.approx in a boolean context, which is unsupported since pytest7
"test_percent_covered"
# assert '<!DOCTYPE ht...ody>\n</html>' == '<!DOCTYPE ht...ody>\n</html>'
"test_html_with_external_css"
# assert '<table class...</tr></table>' == '<div class=".../table></div>'
"test_format"
"test_format_with_invalid_violation_lines"
"test_no_filename_ext"
"test_unicode"
"test_load_snippets_html"
"test_load_utf8_snippets"
"test_load_declared_arabic"
# Comparing console output doesn't work reliable
"console"
];
pythonImportsCheck = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.4";
version = "1.21.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fiRd433bb0neUeyBtS3KbnYoJJzbGvKrZ29dofGYp0s=";
sha256 = "sha256-kS42WokR7ZIqIPi8LbX4tmtjn37tckea2ELbuqzTm2o=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

View File

@ -0,0 +1,61 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, ujson
}:
buildPythonPackage rec {
pname = "ripe-atlas-sagan";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "RIPE-NCC";
repo = pname;
rev = "v${version}";
hash = "sha256-xIBIKsQvDmVBa/C8/7Wr3WKeepHaGhoXlgatXSUtWLA=";
};
propagatedBuildInputs = [
cryptography
python-dateutil
pytz
];
passthru.optional-dependencies = {
fast = [
ujson
];
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"tests/*.py"
];
disabledTests = [
# This test fail for unknown reason, I suspect it to be flaky.
"test_invalid_country_code"
];
pythonImportsCheck = [
"ripe.atlas.sagan"
];
meta = with lib; {
description = "A parsing library for RIPE Atlas measurements results";
homepage = "https://github.com/RIPE-NCC/ripe-atlas-sagan";
license = licenses.gpl3Only;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "tabula-py";
version = "2.5.0";
version = "2.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "chezou";
repo = pname;
rev = "v${version}";
hash = "sha256-SYDwMVJMBRAtjkHMZQct17RueMbRZ5aDENDGkkrahrY=";
hash = "sha256-Dfi6LzrLDz9VVDmbeK1dEaWuQosD4tvAH13Q4Mp3smA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.27.2";
version = "1.27.5";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
hash = "sha256-SFh8LHHEdyjPmQDWcDIH/zfGvJanHcuOfVAjTFBwnoY=";
hash = "sha256-uywh5wYA1MD/7VJWfXvDaV8pYoj4i7Ais2fSAiljX7Q=";
};
ldflags = [
@ -22,7 +22,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-Z1UIE2sqIoF74uSy6sIUubpvdWdDa04gZB5gDOYJzHk=";
vendorSha256 = "sha256-VL1kR8iL/mvtdRZPyp4lG2hClwdNOjQPpaOBsOxATds=";
subPackages = [
"cmd/tfsec"

View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-BTb01EKPBBTZR8g3RkW0llj169wk6Y7Ui4UoCR+YWsc=";
hash = "sha256-IPBq1jFUCJXG/XW1M1AoD3pfj2/jnGR1NLgbO5zcqFg=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubepug";
version = "1.3.4";
version = "1.4.0";
src = fetchFromGitHub {
owner = "rikatz";
repo = "kubepug";
rev = "v${version}";
sha256 = "sha256-BljDmyueGtQztdHnix4YP+zvhor1+ofahQ8971/o1xY=";
sha256 = "sha256-ySGNEs9PwkpjcLaCZ9M6ewE0/PRdwDksJMJ2GZUUrng=";
};
vendorSha256 = "sha256-SZckJDFYGsjYEzpJOZ1BE0gNLqn4so23OcOUnPo6zdU=";
vendorSha256 = "sha256-faco4/6ldZiD2pkvjFgWDHbpCcNA4dGXxVhuO3PK77k=";
ldflags = [
"-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}"

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-wipe";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "mihai-dinculescu";
repo = "cargo-wipe";
rev = "v${version}";
sha256 = "sha256-AlmXq2jbU8mQ23Q64a8QiKXwiWkIfr98vAoq7FLImhA=";
sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
};
cargoSha256 = "sha256-vsN4cM4Q9LX1ZgAA5x7PupOTh0IcjI65xzuCPjy8YOs=";
cargoSha256 = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ=";
passthru = {
updateScript = nix-update-script {

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "lightspark";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "lightspark";
repo = "lightspark";
rev = version;
sha256 = "sha256-F+zCwKTPWkp+VWYvYN5+VbBJeQAwspKy7+Uv+ZstowA=";
sha256 = "sha256-/Nd69YFctLDJ8SM9WvYp6okyPQd6+ob2mBN3sPg+7Ww=";
};
postPatch = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.209";
version = "1.210";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "sha256-xLdn5MANZVvU+Vl3yaHDaNZCd48KaMY4UzuI/jc7jEQ=";
sha256 = "sha256-7kHUwKQoNCHphZiUs3jwYeosiL5Kxp3rimOJX8PmwJk=";
};
nativeBuildInputs = [ dpkg ];

View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitLab
, autoreconfHook
, intltool
, itstool
, pkg-config
, vala
, glib
, graphviz
, yelp-tools
, gtk3
, lrzsz
}:
stdenv.mkDerivation rec {
pname = "moserial";
version = "3.0.21";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "moserial_${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-wfdI51ECqVNcUrIVjYBijf/yqpiwSQeMiKaVJSSma3k=";
};
nativeBuildInputs = [
autoreconfHook
intltool
itstool
pkg-config
vala
];
buildInputs = [
glib
graphviz
yelp-tools
gtk3
];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ lrzsz ]}
)
'';
meta = with lib; {
description = "Clean, friendly gtk-based serial terminal for the gnome desktop";
homepage = "https://wiki.gnome.org/moserial";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ linsui ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,91 @@
{ stdenv, lib, nixosTests, buildGoModule, fetchFromGitHub, installShellFiles
, pkg-config
, libayatana-appindicator, libX11, libXcursor, libXxf86vm
, Cocoa, IOKit, Kernel, UserNotifications, WebKit
, ui ? false }:
let
modules = if ui then {
"client/ui" = "netbird-ui";
} else {
client = "netbird";
management = "netbird-mgmt";
signal = "netbird-signal";
};
in
buildGoModule rec {
pname = "netbird";
version = "0.8.9";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bQrfYbzYd6T9PD2lLuldp1pGoZKpU71bO1D1SXcoZ7M=";
};
vendorSha256 = "sha256-KtRQwrCBsOX7Jk9mKdDNOD7zfssADfBXCO1RPZbp5Aw=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
buildInputs = lib.optionals (stdenv.isLinux && ui) [
libayatana-appindicator
libX11
libXcursor
libXxf86vm
] ++ lib.optionals (stdenv.isDarwin && ui) [
Cocoa
IOKit
Kernel
UserNotifications
WebKit
];
subPackages = lib.attrNames modules;
ldflags = [
"-s"
"-w"
"-X github.com/netbirdio/netbird/client/system.version=${version}"
"-X main.builtBy=nix"
];
# needs network access
doCheck = false;
postPatch = ''
# make it compatible with systemd's RuntimeDirectory
substituteInPlace client/cmd/root.go \
--replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
substituteInPlace client/ui/client_ui.go \
--replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
'';
postInstall = lib.concatStringsSep "\n" (lib.mapAttrsToList
(module: binary: ''
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
'' + lib.optionalString (!ui) ''
installShellCompletion --cmd ${binary} \
--bash <($out/bin/${binary} completion bash) \
--fish <($out/bin/${binary} completion fish) \
--zsh <($out/bin/${binary} completion zsh)
'')
modules) + lib.optionalString (stdenv.isLinux && ui) ''
mkdir -p $out/share/pixmaps
cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png
mkdir -p $out/share/applications
cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop
substituteInPlace $out/share/applications/netbird.desktop \
--replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
'';
passthru.tests.netbird = nixosTests.netbird;
meta = with lib; {
homepage = "https://netbird.io";
description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
license = licenses.bsd3;
maintainers = with maintainers; [ misuzu ];
};
}

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "rpm";
version = "4.17.0";
version = "4.17.1";
src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a";
url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
hash = "sha256-DBG3k0ZucliFH/gr1lyP/Ywtu8cKzIaaXTQVBUmSbl0=";
};
outputs = [ "out" "dev" "man" ];

View File

@ -5150,6 +5150,14 @@ with pkgs;
inherit (xorg) libXaw;
};
netbird = callPackage ../tools/networking/netbird {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit;
};
netbird-ui = netbird.override {
ui = true;
};
netevent = callPackage ../tools/inputmethods/netevent { };
netplan = callPackage ../tools/admin/netplan { };
@ -20371,6 +20379,8 @@ with pkgs;
movit = callPackage ../development/libraries/movit { };
moserial = callPackage ../tools/misc/moserial { };
mosquitto = callPackage ../servers/mqtt/mosquitto { };
mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; };
@ -20493,6 +20503,8 @@ with pkgs;
nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
nng = callPackage ../development/libraries/nng { };
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; };

View File

@ -9533,6 +9533,8 @@ in {
ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { };
ripe-atlas-sagan = callPackage ../development/python-modules/ripe-atlas-sagan { };
riprova = callPackage ../development/python-modules/riprova { };
ripser = callPackage ../development/python-modules/ripser { };