mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 11:50:06 +00:00
Merge release-22.11 into staging-next-22.11
This commit is contained in:
github-actions[bot]
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -89,9 +89,6 @@ stdenv.mkDerivation rec {
|
||||
libGLESv2 = lib.makeLibraryPath [
|
||||
xorg.libX11 xorg.libXext xorg.libxcb wayland
|
||||
];
|
||||
libsmartscreen = lib.makeLibraryPath [
|
||||
libuuid stdenv.cc.cc.lib
|
||||
];
|
||||
libsmartscreenn = lib.makeLibraryPath [
|
||||
libuuid
|
||||
];
|
||||
@@ -126,10 +123,6 @@ stdenv.mkDerivation rec {
|
||||
--set-rpath "${libPath.libGLESv2}" \
|
||||
opt/microsoft/${shortName}/libGLESv2.so
|
||||
|
||||
patchelf \
|
||||
--set-rpath "${libPath.libsmartscreen}" \
|
||||
opt/microsoft/${shortName}/libsmartscreen.so
|
||||
|
||||
patchelf \
|
||||
--set-rpath "${libPath.libsmartscreenn}" \
|
||||
opt/microsoft/${shortName}/libsmartscreenn.so
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "111.0.1661.44";
|
||||
revision = "1";
|
||||
sha256 = "sha256-ePViYQZUteMBkV7AkvsoQwPVxibMB68LDWgg7d82iIE=";
|
||||
};
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "108.0.1462.20";
|
||||
version = "112.0.1722.15";
|
||||
revision = "1";
|
||||
sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm";
|
||||
sha256 = "sha256-Ba6f5MOBTtY8bUxCcMySQCWqDvOiI1hLnuwcIspReq8=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "109.0.1495.2";
|
||||
version = "113.0.1741.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "107.0.1418.52";
|
||||
revision = "1";
|
||||
sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day";
|
||||
sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ assert with lib.strings; (
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "32.0.1";
|
||||
version = "32.1.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-lz9Ok8i95pVfl4UHy2zWFe9vwJocUvDbueiWdZuz4Bo=";
|
||||
sha256 = "sha256-yfXcHoPdTknryYFV8mBWHvzs68oELqsJjTC/nT4SMB8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.25";
|
||||
ptb = "0.0.39";
|
||||
ptb = "0.0.41";
|
||||
canary = "0.0.150";
|
||||
} else {
|
||||
stable = "0.0.273";
|
||||
@@ -18,7 +18,7 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks=";
|
||||
sha256 = "AhiZXgkXG/lroG7XAgcvJ7r5PSvzMFhamsxB1cXJOak=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff -pru liferea-1.14.3-orig/src/common.c liferea-1.14.3/src/common.c
|
||||
--- liferea-1.14.3-orig/src/common.c 2023-03-23 20:36:21.000000000 +0100
|
||||
+++ liferea-1.14.3/src/common.c 2023-03-24 23:34:08.971922545 +0100
|
||||
@@ -85,6 +85,8 @@ common_init_paths (void)
|
||||
common_check_dir (g_build_filename (g_get_user_config_dir(), "liferea", NULL));
|
||||
common_check_dir (g_build_filename (g_get_user_data_dir(), "liferea", NULL));
|
||||
|
||||
+ pathsChecked = TRUE;
|
||||
+
|
||||
/* Install default stylesheet if it does not yet exist */
|
||||
filename = common_create_config_filename ("liferea.css");
|
||||
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
|
||||
@@ -95,8 +97,6 @@ common_init_paths (void)
|
||||
umask (077);
|
||||
|
||||
g_free (lifereaCachePath);
|
||||
-
|
||||
- pathsChecked = TRUE;
|
||||
}
|
||||
|
||||
gchar *
|
||||
@@ -24,13 +24,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liferea";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "aXgw3MwleHDw2yNbs5Cin687xVTLxeNwBt94c1b4fXQ=";
|
||||
sha256 = "VmEyGXrePdnRzRldSOOfiB55KBu7w9x4Y9vA8gufot4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/lwindolf/liferea/issues/1217
|
||||
./bug-1217-segfaults.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
python3Packages.wrapPython
|
||||
|
||||
@@ -8,13 +8,13 @@ Subject: [PATCH] Remove geo from database.yml
|
||||
1 file changed, 28 deletions(-)
|
||||
|
||||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index 5329a8e9fd7..a4daab1fd0c 100644
|
||||
index c1b1247b5b08..a81437d1e1b5 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -18,13 +18,6 @@ production:
|
||||
# port: 8600
|
||||
# record: secondary.postgresql.service.consul
|
||||
# interval: 300
|
||||
@@ -26,13 +26,6 @@ production:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
@@ -25,10 +25,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
|
||||
|
||||
#
|
||||
# Development specific
|
||||
@@ -39,13 +32,6 @@ development:
|
||||
host: localhost
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
@@ -57,13 +50,6 @@ development:
|
||||
# host: localhost
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
@@ -39,10 +39,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
|
||||
|
||||
#
|
||||
# Staging specific
|
||||
@@ -58,13 +44,6 @@ staging:
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
@@ -84,13 +70,6 @@ staging:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
@@ -53,10 +53,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
|
||||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
@@ -80,10 +59,3 @@ test: &test
|
||||
prepared_statements: false
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
@@ -117,10 +96,3 @@ test: &test
|
||||
# prepared_statements: false
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"version": "15.8.4",
|
||||
"repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=",
|
||||
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
|
||||
"version": "15.10.0",
|
||||
"repo_hash": "sha256-jpJd6CneCfw+Ia0CTlX5YcEMl+2Tmd2+zfw8L+hKYTk=",
|
||||
"yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.8.4-ee",
|
||||
"rev": "v15.10.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.8.4",
|
||||
"GITLAB_PAGES_VERSION": "15.8.4",
|
||||
"GITLAB_SHELL_VERSION": "14.15.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.4"
|
||||
"GITALY_SERVER_VERSION": "15.10.0",
|
||||
"GITLAB_PAGES_VERSION": "15.10.0",
|
||||
"GITLAB_SHELL_VERSION": "14.18.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.10.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -166,6 +166,7 @@ stdenv.mkDerivation {
|
||||
# path, not their relative state directory path. This gets rid of
|
||||
# warnings and means we don't have to link back to lib from the
|
||||
# state directory.
|
||||
${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config
|
||||
${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config
|
||||
${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config
|
||||
'';
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'gitlab-markup', '~> 1.7.1'
|
||||
gem 'activesupport', '~> 6.1.6.1'
|
||||
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
|
||||
gem 'sentry-raven', '~> 3.0', require: false
|
||||
gem 'rugged', '~> 1.5.1'
|
||||
gem 'gitlab-markup', '~> 1.8.0'
|
||||
gem 'activesupport', '~> 6.1.7.2'
|
||||
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem
|
||||
gem 'sentry-raven', '~> 3.1', require: false
|
||||
gem 'rbtrace', require: false
|
||||
|
||||
# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
|
||||
@@ -12,13 +12,14 @@ gem 'rbtrace', require: false
|
||||
gem 'gitaly', '~> 15.5.0'
|
||||
|
||||
# Labkit provides observability functionality
|
||||
gem 'gitlab-labkit', '~> 0.29'
|
||||
gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
|
||||
|
||||
# Detects the open source license the repository includes
|
||||
# This version needs to be in sync with GitLab CE/EE
|
||||
gem 'licensee', '~> 9.15'
|
||||
|
||||
gem 'google-protobuf', '~> 3.21.12'
|
||||
gem 'google-protobuf', '~> 3.22.2'
|
||||
gem 'nokogiri', '~> 1.14'
|
||||
|
||||
# Rails is currently blocked on the upgrade to the new major version for Redis,
|
||||
# so we don't upgrade either until the issue is resolved. This is an indirect
|
||||
@@ -26,12 +27,11 @@ gem 'google-protobuf', '~> 3.21.12'
|
||||
gem 'redis', '~> 4.8.0'
|
||||
|
||||
group :development, :test do
|
||||
gem 'rubocop', '~> 0.69', require: false
|
||||
gem 'rspec', require: false
|
||||
gem 'rubocop', '~> 1.38', require: false
|
||||
gem 'rspec', '~> 3.12.0', require: false
|
||||
gem 'rspec-parameterized', require: false
|
||||
gem 'timecop', require: false
|
||||
gem 'factory_bot', require: false
|
||||
gem 'pry', '~> 0.12.2', require: false
|
||||
gem 'pry', '~> 0.13.1', require: false
|
||||
end
|
||||
|
||||
# Gems required in omnibus-gitlab pipeline
|
||||
|
||||
@@ -1,52 +1,46 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
actionpack (6.1.6.1)
|
||||
actionview (= 6.1.6.1)
|
||||
activesupport (= 6.1.6.1)
|
||||
actionpack (6.1.7.2)
|
||||
actionview (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
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.6.1)
|
||||
activesupport (= 6.1.6.1)
|
||||
actionview (6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activesupport (6.1.6.1)
|
||||
activesupport (6.1.7.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
ast (2.4.2)
|
||||
binding_ninja (0.2.3)
|
||||
binding_of_caller (1.0.0)
|
||||
debug_inspector (>= 0.0.1)
|
||||
builder (3.2.4)
|
||||
coderay (1.1.2)
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
concurrent-ruby (1.2.0)
|
||||
crass (1.0.6)
|
||||
debug_inspector (1.1.0)
|
||||
diff-lcs (1.3)
|
||||
dotenv (2.7.6)
|
||||
equalizer (0.0.11)
|
||||
erubi (1.11.0)
|
||||
factory_bot (5.0.2)
|
||||
activesupport (>= 4.2.0)
|
||||
erubi (1.12.0)
|
||||
factory_bot (6.2.1)
|
||||
activesupport (>= 5.0.0)
|
||||
faraday (1.0.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.15.5)
|
||||
gitaly (15.5.0)
|
||||
grpc (~> 1.0)
|
||||
gitlab-labkit (0.29.0)
|
||||
gitlab-labkit (0.31.1)
|
||||
actionpack (>= 5.0.0, < 8.0.0)
|
||||
activesupport (>= 5.0.0, < 8.0.0)
|
||||
grpc (>= 1.37)
|
||||
@@ -61,8 +55,8 @@ GEM
|
||||
tomlrb (>= 1.3, < 2.1)
|
||||
with_env (= 1.1.0)
|
||||
xml-simple (~> 1.1.5)
|
||||
gitlab-markup (1.7.1)
|
||||
google-protobuf (3.21.12)
|
||||
gitlab-markup (1.8.1)
|
||||
google-protobuf (3.22.2)
|
||||
googleapis-common-protos-types (1.4.0)
|
||||
google-protobuf (~> 3.14)
|
||||
grpc (1.42.0)
|
||||
@@ -70,10 +64,10 @@ GEM
|
||||
googleapis-common-protos-types (~> 1.0)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
jaeger-client (1.1.0)
|
||||
opentracing (~> 0.3)
|
||||
thrift
|
||||
json (2.6.3)
|
||||
licensee (9.15.2)
|
||||
dotenv (~> 2.0)
|
||||
octokit (~> 4.20)
|
||||
@@ -83,14 +77,12 @@ GEM
|
||||
loofah (2.19.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
method_source (0.9.2)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.16.3)
|
||||
method_source (1.0.0)
|
||||
mini_portile2 (2.8.1)
|
||||
minitest (5.17.0)
|
||||
msgpack (1.3.3)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.13.10)
|
||||
nokogiri (1.14.1)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
octokit (4.20.0)
|
||||
@@ -98,120 +90,118 @@ GEM
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
opentracing (0.5.0)
|
||||
optimist (3.0.1)
|
||||
parallel (1.19.2)
|
||||
parser (3.0.3.2)
|
||||
parallel (1.22.1)
|
||||
parser (3.2.0.0)
|
||||
ast (~> 2.4.1)
|
||||
pg_query (2.2.0)
|
||||
pg_query (2.2.1)
|
||||
google-protobuf (>= 3.19.2)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
parser
|
||||
unparser
|
||||
procto (0.0.3)
|
||||
pry (0.12.2)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
pry (0.13.1)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
public_suffix (4.0.7)
|
||||
racc (1.6.1)
|
||||
rack (2.2.4)
|
||||
racc (1.6.2)
|
||||
rack (2.2.6.3)
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.4)
|
||||
rails-html-sanitizer (1.5.0)
|
||||
loofah (~> 2.19, >= 2.19.1)
|
||||
rainbow (3.0.0)
|
||||
rainbow (3.1.1)
|
||||
rbtrace (0.4.14)
|
||||
ffi (>= 1.0.6)
|
||||
msgpack (>= 0.4.3)
|
||||
optimist (>= 3.0.0)
|
||||
redis (4.8.0)
|
||||
regexp_parser (1.8.1)
|
||||
regexp_parser (2.6.2)
|
||||
reverse_markdown (1.4.0)
|
||||
nokogiri
|
||||
rexml (3.2.5)
|
||||
rspec (3.8.0)
|
||||
rspec-core (~> 3.8.0)
|
||||
rspec-expectations (~> 3.8.0)
|
||||
rspec-mocks (~> 3.8.0)
|
||||
rspec-core (3.8.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-expectations (3.8.3)
|
||||
rspec (3.12.0)
|
||||
rspec-core (~> 3.12.0)
|
||||
rspec-expectations (~> 3.12.0)
|
||||
rspec-mocks (~> 3.12.0)
|
||||
rspec-core (3.12.0)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-expectations (3.12.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-mocks (3.8.0)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-mocks (3.12.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-parameterized (0.4.2)
|
||||
binding_ninja (>= 0.2.3)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-parameterized (1.0.0)
|
||||
rspec-parameterized-core (< 2)
|
||||
rspec-parameterized-table_syntax (< 2)
|
||||
rspec-parameterized-core (1.0.0)
|
||||
parser
|
||||
proc_to_ast
|
||||
rspec (>= 2.13, < 4)
|
||||
unparser
|
||||
rspec-support (3.8.0)
|
||||
rubocop (0.86.0)
|
||||
rspec-parameterized-table_syntax (1.0.0)
|
||||
binding_of_caller
|
||||
rspec-parameterized-core (< 2)
|
||||
rspec-support (3.12.0)
|
||||
rubocop (1.44.0)
|
||||
json (~> 2.3)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.7.0.1)
|
||||
parser (>= 3.2.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.7)
|
||||
rexml
|
||||
rubocop-ast (>= 0.0.3, < 1.0)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml (>= 3.2.5, < 4.0)
|
||||
rubocop-ast (>= 1.24.1, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 2.0)
|
||||
rubocop-ast (0.2.0)
|
||||
parser (>= 2.7.0.1)
|
||||
ruby-progressbar (1.10.1)
|
||||
unicode-display_width (>= 2.4.0, < 3.0)
|
||||
rubocop-ast (1.24.1)
|
||||
parser (>= 3.1.1.0)
|
||||
ruby-progressbar (1.11.0)
|
||||
rubyzip (2.3.2)
|
||||
rugged (1.2.0)
|
||||
rugged (1.5.1)
|
||||
sawyer (0.8.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
sentry-raven (3.0.4)
|
||||
sentry-raven (3.1.2)
|
||||
faraday (>= 1.0)
|
||||
thor (1.1.0)
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.17.0)
|
||||
timecop (0.9.1)
|
||||
thrift (0.18.1)
|
||||
tomlrb (2.0.1)
|
||||
tzinfo (2.0.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (1.7.0)
|
||||
unparser (0.4.7)
|
||||
abstract_type (~> 0.0.7)
|
||||
adamantium (~> 0.2.0)
|
||||
concord (~> 0.1.5)
|
||||
unicode-display_width (2.4.2)
|
||||
unparser (0.6.7)
|
||||
diff-lcs (~> 1.3)
|
||||
equalizer (~> 0.0.9)
|
||||
parser (>= 2.6.5)
|
||||
procto (~> 0.0.2)
|
||||
parser (>= 3.2.0)
|
||||
with_env (1.1.0)
|
||||
xml-simple (1.1.9)
|
||||
rexml
|
||||
zeitwerk (2.6.0)
|
||||
zeitwerk (2.6.6)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport (~> 6.1.6.1)
|
||||
activesupport (~> 6.1.7.2)
|
||||
factory_bot
|
||||
gitaly (~> 15.5.0)
|
||||
gitlab-labkit (~> 0.29)
|
||||
gitlab-labkit (~> 0.31, >= 0.31.1)
|
||||
gitlab-license_finder
|
||||
gitlab-markup (~> 1.7.1)
|
||||
google-protobuf (~> 3.21.12)
|
||||
gitlab-markup (~> 1.8.0)
|
||||
google-protobuf (~> 3.22.2)
|
||||
grpc (~> 1.42.0)
|
||||
licensee (~> 9.15)
|
||||
pry (~> 0.12.2)
|
||||
nokogiri (~> 1.14)
|
||||
pry (~> 0.13.1)
|
||||
rbtrace
|
||||
redis (~> 4.8.0)
|
||||
rspec
|
||||
rspec (~> 3.12.0)
|
||||
rspec-parameterized
|
||||
rubocop (~> 0.69)
|
||||
rugged (~> 1.2)
|
||||
sentry-raven (~> 3.0)
|
||||
timecop
|
||||
rubocop (~> 1.38)
|
||||
rugged (~> 1.5.1)
|
||||
sentry-raven (~> 3.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.26
|
||||
2.4.8
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.8.4";
|
||||
version = "15.10.0";
|
||||
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-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc=";
|
||||
sha256 = "sha256-MHxpij4aT4sq7csWRAEr6NQ9PdFkEnrEPegVtBIXUNo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
|
||||
vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
|
||||
|
||||
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
|
||||
|
||||
|
||||
@@ -1,22 +1,14 @@
|
||||
{
|
||||
abstract_type = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.7";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
|
||||
sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.6.1";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
@@ -24,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
|
||||
sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.6.1";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
@@ -35,19 +27,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
|
||||
sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.6.1";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@@ -70,15 +53,16 @@
|
||||
};
|
||||
version = "2.4.2";
|
||||
};
|
||||
binding_ninja = {
|
||||
binding_of_caller = {
|
||||
dependencies = ["debug_inspector"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
|
||||
sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.3";
|
||||
version = "1.0.0";
|
||||
};
|
||||
builder = {
|
||||
groups = ["default"];
|
||||
@@ -98,24 +82,15 @@
|
||||
};
|
||||
version = "1.1.2";
|
||||
};
|
||||
concord = {
|
||||
dependencies = ["adamantium" "equalizer"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.5";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.10";
|
||||
version = "1.2.0";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
@@ -127,6 +102,16 @@
|
||||
};
|
||||
version = "1.0.6";
|
||||
};
|
||||
debug_inspector = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
diff-lcs = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@@ -145,23 +130,15 @@
|
||||
};
|
||||
version = "2.7.6";
|
||||
};
|
||||
equalizer = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.11";
|
||||
};
|
||||
erubi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
|
||||
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
factory_bot = {
|
||||
dependencies = ["activesupport"];
|
||||
@@ -169,10 +146,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk";
|
||||
sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.2";
|
||||
version = "6.2.1";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["multipart-post"];
|
||||
@@ -212,10 +189,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb";
|
||||
sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.29.0";
|
||||
version = "0.31.1";
|
||||
};
|
||||
gitlab-license_finder = {
|
||||
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
|
||||
@@ -233,20 +210,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7";
|
||||
sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
};
|
||||
google-protobuf = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
|
||||
sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.21.12";
|
||||
version = "3.22.2";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
@@ -281,14 +258,6 @@
|
||||
};
|
||||
version = "1.12.0";
|
||||
};
|
||||
ice_nine = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.2";
|
||||
};
|
||||
jaeger-client = {
|
||||
dependencies = ["opentracing" "thrift"];
|
||||
groups = ["default"];
|
||||
@@ -300,6 +269,16 @@
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
json = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.3";
|
||||
};
|
||||
licensee = {
|
||||
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
|
||||
groups = ["default"];
|
||||
@@ -322,42 +301,35 @@
|
||||
};
|
||||
version = "2.19.1";
|
||||
};
|
||||
memoizable = {
|
||||
dependencies = ["thread_safe"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.2";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
|
||||
sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.2";
|
||||
version = "1.0.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
|
||||
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.16.3";
|
||||
version = "5.17.0";
|
||||
};
|
||||
msgpack = {
|
||||
groups = ["default"];
|
||||
@@ -385,10 +357,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
|
||||
sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.10";
|
||||
version = "1.14.1";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@@ -426,10 +398,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
|
||||
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.2";
|
||||
version = "1.22.1";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
@@ -437,10 +409,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
|
||||
sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.3.2";
|
||||
version = "3.2.0.0";
|
||||
};
|
||||
pg_query = {
|
||||
dependencies = ["google-protobuf"];
|
||||
@@ -448,10 +420,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4";
|
||||
sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
};
|
||||
proc_to_ast = {
|
||||
dependencies = ["coderay" "parser" "unparser"];
|
||||
@@ -462,22 +434,16 @@
|
||||
};
|
||||
version = "0.1.0";
|
||||
};
|
||||
procto = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.3";
|
||||
};
|
||||
pry = {
|
||||
dependencies = ["coderay" "method_source"];
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
|
||||
sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.12.2";
|
||||
version = "0.13.1";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
@@ -494,20 +460,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
|
||||
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
|
||||
sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.4";
|
||||
version = "2.2.6.3";
|
||||
};
|
||||
rack-test = {
|
||||
dependencies = ["rack"];
|
||||
@@ -537,18 +503,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
|
||||
sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
|
||||
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
};
|
||||
rbtrace = {
|
||||
dependencies = ["ffi" "msgpack" "optimist"];
|
||||
@@ -576,10 +544,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
|
||||
sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.1";
|
||||
version = "2.6.2";
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
@@ -608,10 +576,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
|
||||
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.0";
|
||||
version = "3.12.0";
|
||||
};
|
||||
rspec-core = {
|
||||
dependencies = ["rspec-support"];
|
||||
@@ -619,10 +587,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
|
||||
sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.0";
|
||||
version = "3.12.0";
|
||||
};
|
||||
rspec-expectations = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
@@ -630,10 +598,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy";
|
||||
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.3";
|
||||
version = "3.12.2";
|
||||
};
|
||||
rspec-mocks = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
@@ -641,42 +609,64 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
|
||||
sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.0";
|
||||
version = "3.12.3";
|
||||
};
|
||||
rspec-parameterized = {
|
||||
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
|
||||
dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"];
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
|
||||
sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.2";
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-parameterized-core = {
|
||||
dependencies = ["parser" "proc_to_ast" "rspec" "unparser"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-parameterized-table_syntax = {
|
||||
dependencies = ["binding_of_caller" "rspec-parameterized-core"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-support = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
|
||||
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.0";
|
||||
version = "3.12.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms";
|
||||
sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.86.0";
|
||||
version = "1.44.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
@@ -684,20 +674,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97";
|
||||
sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "1.24.1";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
|
||||
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
};
|
||||
rubyzip = {
|
||||
groups = ["default" "development" "omnibus" "test"];
|
||||
@@ -714,10 +704,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
|
||||
sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.5.1";
|
||||
};
|
||||
sawyer = {
|
||||
dependencies = ["addressable" "faraday"];
|
||||
@@ -736,10 +726,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
|
||||
sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.4";
|
||||
version = "3.1.2";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
@@ -751,31 +741,15 @@
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
thread_safe = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.6";
|
||||
};
|
||||
thrift = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80";
|
||||
sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.17.0";
|
||||
};
|
||||
timecop = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.1";
|
||||
version = "0.18.1";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = ["default" "development" "omnibus" "test"];
|
||||
@@ -803,21 +777,21 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
|
||||
sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
version = "2.4.2";
|
||||
};
|
||||
unparser = {
|
||||
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
|
||||
dependencies = ["diff-lcs" "parser"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx";
|
||||
sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.7";
|
||||
version = "0.6.7";
|
||||
};
|
||||
with_env = {
|
||||
groups = ["default" "development" "omnibus" "test"];
|
||||
@@ -845,9 +819,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
|
||||
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.0";
|
||||
version = "2.6.6";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{ lib, fetchFromGitLab, buildGoModule, ruby }:
|
||||
{ lib, fetchFromGitLab, buildGoModule, ruby, libkrb5 }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.15.0";
|
||||
version = "14.18.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs=";
|
||||
sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
buildInputs = [ ruby libkrb5 ];
|
||||
|
||||
patches = [ ./remove-hardcoded-locations.patch ];
|
||||
|
||||
vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs=";
|
||||
vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||
|
||||
@@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.8.4";
|
||||
version = "15.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
|
||||
sourceRoot = "source/workhorse";
|
||||
|
||||
vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw=";
|
||||
vendorSha256 = "sha256-HG/QobU1LsFhbNF4lNq9tLwjcLD2l3TXnsJ+tjqc0Q8=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
||||
@@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
|
||||
# NOTE: When incrementing the major or minor version here, also increment activerecord_version
|
||||
# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
|
||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
|
||||
gem 'rails', '~> 6.1.6.1'
|
||||
gem 'rails', '~> 6.1.7.2'
|
||||
|
||||
gem 'bootsnap', '~> 1.15.0', require: false
|
||||
gem 'bootsnap', '~> 1.16.0', require: false
|
||||
|
||||
# Pin openssl to match the version bundled with our supported Rubies.
|
||||
# See https://stdgems.org/openssl/#gem-version.
|
||||
@@ -33,13 +33,10 @@ gem 'sprockets', '~> 3.7.0'
|
||||
|
||||
gem 'view_component', '~> 2.74.1'
|
||||
|
||||
# Default values for AR models
|
||||
gem 'default_value_for', '~> 3.4.0'
|
||||
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.4.5'
|
||||
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'rugged', '~> 1.5'
|
||||
gem 'grape-path-helpers', '~> 1.7.1'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
@@ -62,25 +59,26 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
|
||||
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
|
||||
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
|
||||
gem 'omniauth-alicloud', '~> 2.0.0'
|
||||
gem 'omniauth-alicloud', '~> 2.0.1'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
gem 'omniauth-github', '2.0.1'
|
||||
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
|
||||
gem 'omniauth-google-oauth2', '~> 1.1'
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||
gem 'omniauth-saml', '~> 2.0.0'
|
||||
gem 'omniauth-shibboleth', '~> 1.3.0'
|
||||
gem 'omniauth-twitter', '~> 1.4'
|
||||
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
|
||||
gem 'omniauth-authentiq', '~> 0.3.3'
|
||||
gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
|
||||
gem 'omniauth_openid_connect', '~> 0.6.1'
|
||||
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
|
||||
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
|
||||
gem 'openid_connect', '= 1.3.0'
|
||||
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
|
||||
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
|
||||
gem 'rack-oauth2', '~> 1.21.3'
|
||||
gem 'jwt', '~> 2.1.0'
|
||||
|
||||
# Kerberos authentication. EE-only
|
||||
gem 'gssapi', group: :kerberos
|
||||
gem 'gssapi', '~> 1.3.1', group: :kerberos
|
||||
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -142,19 +140,32 @@ gem 'carrierwave', '~> 1.3'
|
||||
gem 'mini_magick', '~> 4.10.1'
|
||||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 3.15'
|
||||
gem 'fog-aws', '~> 3.18'
|
||||
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
|
||||
# Also see config/initializers/fog_core_patch.rb.
|
||||
gem 'fog-core', '= 2.1.0'
|
||||
gem 'fog-google', '~> 1.19', require: 'fog/google'
|
||||
gem 'fog-local', '~> 0.8'
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
|
||||
# NOTE:
|
||||
# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
|
||||
# the rest-client gem to drop the Content-Length header field for chunked transfers,
|
||||
# which may have knock-on effects on other features using `RestClient`.
|
||||
# We may want to update this dependency if this is ever addressed upstream, e.g. via
|
||||
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
|
||||
gem 'fog-aliyun', '~> 0.4'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
gem 'google-cloud-storage', '~> 1.44.0'
|
||||
gem 'google-apis-core', '~> 0.10.0'
|
||||
gem 'google-apis-compute_v1', '~> 0.57.0'
|
||||
gem 'google-apis-container_v1', '~> 0.43.0'
|
||||
gem 'google-apis-container_v1beta1', '~> 0.43.0'
|
||||
gem 'google-apis-cloudbilling_v1', '~> 0.21.0'
|
||||
gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0'
|
||||
gem 'google-apis-iam_v1', '~> 0.36.0'
|
||||
gem 'google-apis-serviceusage_v1', '~> 0.28.0'
|
||||
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0'
|
||||
|
||||
# for aws storage
|
||||
gem 'unf', '~> 0.1.4'
|
||||
@@ -166,16 +177,16 @@ gem 'seed-fu', '~> 2.3.7'
|
||||
gem 'elasticsearch-model', '~> 7.2'
|
||||
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
|
||||
gem 'elasticsearch-api', '7.13.3'
|
||||
gem 'aws-sdk-core', '~> 3.168.4'
|
||||
gem 'aws-sdk-core', '~> 3.170.1'
|
||||
gem 'aws-sdk-cloudformation', '~> 1'
|
||||
gem 'aws-sdk-s3', '~> 1.117.2'
|
||||
gem 'aws-sdk-s3', '~> 1.119.1'
|
||||
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
|
||||
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
|
||||
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.14.3'
|
||||
gem 'deckar01-task_list', '2.3.2'
|
||||
gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
|
||||
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.23.6'
|
||||
gem 'kramdown', '~> 2.3.1'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
@@ -183,14 +194,13 @@ gem 'rdoc', '~> 6.3.2'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
gem 'asciidoctor', '~> 2.0.17'
|
||||
gem 'asciidoctor', '~> 2.0.18'
|
||||
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.16'
|
||||
gem 'asciidoctor-kroki', '~> 0.7.0', require: false
|
||||
gem 'rouge', '~> 3.30.0'
|
||||
gem 'asciidoctor-kroki', '~> 0.8.0', require: false
|
||||
gem 'rouge', '~> 4.1.0'
|
||||
gem 'truncato', '~> 0.7.12'
|
||||
gem 'bootstrap_form', '~> 4.2.0'
|
||||
gem 'nokogiri', '~> 1.13.10'
|
||||
gem 'nokogiri', '~> 1.14.2'
|
||||
|
||||
# Calendar rendering
|
||||
gem 'icalendar'
|
||||
@@ -223,7 +233,7 @@ gem 'redis-namespace', '~> 1.9.0'
|
||||
gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
gem 'fugit', '~> 1.2.1'
|
||||
gem 'fugit', '~> 1.8.1'
|
||||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.20.0'
|
||||
@@ -277,7 +287,7 @@ gem 'asana', '~> 0.10.13'
|
||||
gem 'ruby-fogbugz', '~> 0.3.0'
|
||||
|
||||
# Kubernetes integration
|
||||
gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient'
|
||||
gem 'kubeclient', '~> 4.11.0'
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 6.0'
|
||||
@@ -295,7 +305,7 @@ gem 'licensee', '~> 9.15'
|
||||
gem 'charlock_holmes', '~> 0.7.7'
|
||||
|
||||
# Detect mime content type from content
|
||||
gem 'ruby-magic', '~> 0.5'
|
||||
gem 'ruby-magic', '~> 0.6'
|
||||
|
||||
# Faster blank
|
||||
gem 'fast_blank'
|
||||
@@ -329,16 +339,15 @@ gem 'sentry-sidekiq', '~> 5.1.1'
|
||||
|
||||
# PostgreSQL query parsing
|
||||
#
|
||||
gem 'pg_query', '~> 2.2'
|
||||
gem 'pg_query', '~> 2.2', '>= 2.2.1'
|
||||
|
||||
gem 'premailer-rails', '~> 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '~> 0.28.0'
|
||||
gem 'gitlab-labkit', '~> 0.31.1'
|
||||
gem 'thrift', '>= 0.16.0'
|
||||
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
gem 'ruby_parser', '~> 3.19', require: false
|
||||
gem 'rails-i18n', '~> 7.0'
|
||||
gem 'gettext_i18n_rails', '~> 1.8.0'
|
||||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
@@ -349,22 +358,25 @@ gem 'batch-loader', '~> 2.0.1'
|
||||
# Perf bar
|
||||
gem 'peek', '~> 1.1'
|
||||
|
||||
# Google Cloud Profiler support
|
||||
gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false
|
||||
|
||||
# Snowplow events tracking
|
||||
gem 'snowplow-tracker', '~> 0.8.0'
|
||||
|
||||
# Metrics
|
||||
gem 'webrick', '~> 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
|
||||
gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
|
||||
|
||||
gem 'warning', '~> 1.3.0'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 1.2.7', require: false
|
||||
gem 'lefthook', '~> 1.3.3', require: false
|
||||
gem 'rubocop'
|
||||
gem 'solargraph', '~> 0.47.2', require: false
|
||||
|
||||
gem 'letter_opener_web', '~> 2.0.0'
|
||||
gem 'lookbook', '~> 1.4', '>= 1.4.5'
|
||||
gem 'lookbook', '~> 1.5', '>= 1.5.3'
|
||||
|
||||
# Better errors handler
|
||||
gem 'better_errors', '~> 2.9.1'
|
||||
@@ -379,13 +391,13 @@ group :development, :test do
|
||||
gem 'bullet', '~> 7.0.2'
|
||||
gem 'pry-byebug'
|
||||
gem 'pry-rails', '~> 0.3.9'
|
||||
gem 'pry-shell', '~> 0.5.1'
|
||||
gem 'pry-shell', '~> 0.6.1'
|
||||
|
||||
gem 'awesome_print', require: false
|
||||
|
||||
gem 'database_cleaner', '~> 1.7.0'
|
||||
gem 'factory_bot_rails', '~> 6.2.0'
|
||||
gem 'rspec-rails', '~> 5.0.1'
|
||||
gem 'rspec-rails', '~> 6.0.1'
|
||||
|
||||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
gem 'minitest', '~> 5.11.0'
|
||||
@@ -396,13 +408,13 @@ group :development, :test do
|
||||
gem 'spring', '~> 4.1.0'
|
||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
|
||||
gem 'gitlab-styles', '~> 9.2.0', require: false
|
||||
gem 'gitlab-styles', '~> 10.0.0', require: false
|
||||
|
||||
gem 'haml_lint', '~> 0.40.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
||||
# Benchmarking & profiling
|
||||
gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
gem 'benchmark-ips', '~> 2.11.0', require: false
|
||||
gem 'benchmark-memory', '~> 0.1', require: false
|
||||
|
||||
gem 'knapsack', '~> 1.21.1'
|
||||
@@ -422,7 +434,7 @@ group :development, :test do
|
||||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 3.6.4', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 3.8.0', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
@@ -442,7 +454,7 @@ group :test do
|
||||
gem 'rspec-retry', '~> 0.6.1'
|
||||
gem 'rspec_profiling', '~> 0.0.6'
|
||||
gem 'rspec-benchmark', '~> 0.6.0'
|
||||
gem 'rspec-parameterized', require: false
|
||||
gem 'rspec-parameterized', '~> 1.0', require: false
|
||||
|
||||
gem 'capybara', '~> 3.35.3'
|
||||
gem 'capybara-screenshot', '~> 1.0.22'
|
||||
@@ -458,6 +470,7 @@ group :test do
|
||||
gem 'test-prof', '~> 1.0.7'
|
||||
gem 'rspec_junit_formatter'
|
||||
gem 'guard-rspec'
|
||||
gem 'axe-core-rspec'
|
||||
|
||||
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
gem 'derailed_benchmarks', require: false
|
||||
@@ -472,7 +485,7 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
|
||||
gem 'email_reply_trimmer', '~> 0.1'
|
||||
gem 'html2text'
|
||||
|
||||
gem 'stackprof', '~> 0.2.21', require: false
|
||||
gem 'stackprof', '~> 0.2.23', require: false
|
||||
gem 'rbtrace', '~> 0.4', require: false
|
||||
gem 'memory_profiler', '~> 1.0', require: false
|
||||
gem 'activerecord-explain-analyze', '~> 0.1', require: false
|
||||
@@ -497,14 +510,14 @@ gem 'ssh_data', '~> 1.3'
|
||||
gem 'spamcheck', '~> 1.0.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 15.5.2'
|
||||
gem 'gitaly', '~> 15.9.0-rc3'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
||||
gem 'grpc', '~> 1.42.0'
|
||||
|
||||
gem 'google-protobuf', '~> 3.21', '>= 3.21.12'
|
||||
gem 'google-protobuf', '~> 3.22', '>= 3.22.2'
|
||||
|
||||
gem 'toml-rb', '~> 2.2.0'
|
||||
|
||||
@@ -545,14 +558,14 @@ gem 'lockbox', '~> 1.1.1'
|
||||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
gem 'json', '~> 2.5.1'
|
||||
gem 'json', '~> 2.6.3'
|
||||
gem 'json_schemer', '~> 0.2.18'
|
||||
gem 'oj', '~> 3.13.21'
|
||||
gem 'oj-introspect', '~> 0.7'
|
||||
gem 'multi_json', '~> 1.14.1'
|
||||
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
|
||||
|
||||
gem 'webauthn', '~> 2.3'
|
||||
gem 'webauthn', '~> 3.0'
|
||||
|
||||
# IPAddress utilities
|
||||
gem 'ipaddress', '~> 0.8.3'
|
||||
@@ -574,8 +587,18 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
|
||||
gem 'arr-pm', '~> 0.0.12'
|
||||
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList'
|
||||
gem 'CFPropertyList', '~> 3.0.0'
|
||||
gem 'app_store_connect'
|
||||
|
||||
# For phone verification
|
||||
gem 'telesignenterprise', '~> 2.2'
|
||||
|
||||
# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in
|
||||
# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2
|
||||
# Can be removed when support for Ruby 2 is dropped
|
||||
install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do
|
||||
# BufferedIO patch
|
||||
gem 'net-protocol', '~> 0.1.3'
|
||||
end
|
||||
|
||||
gem 'duo_api', '~> 1.3'
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -11,13 +11,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "cutter";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizinorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU=";
|
||||
hash = "sha256-TgYX7FKTi5FBlCRDskGC/OUyh5yvS0nsLUtfCCC4S1w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.4.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
|
||||
sha256 = "sha256-Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g=";
|
||||
hash = "sha256-cauA/DyKycgKEAANg4EoryigXTGg7hg5AMLFxuNQ7KM=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -31,6 +31,8 @@
|
||||
, warzone2100
|
||||
, nixosTests
|
||||
|
||||
, gitUpdater
|
||||
|
||||
, withVideos ? false
|
||||
}:
|
||||
|
||||
@@ -44,11 +46,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "sha256-PDy5mIYAoQ9VAJCTRMiBqUlRtKIqVHiMuBiozTtH5Z4=";
|
||||
sha256 = "sha256-l4QAF+mTaWi/BNPizqpTPw0KdcrYjw71K+D325/BKdo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -115,6 +117,10 @@ stdenv.mkDerivation rec {
|
||||
nixosTest = nixosTests.warzone2100;
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/Warzone2100/warzone2100";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free RTS game, originally developed by Pumpkin Studios";
|
||||
longDescription = ''
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.16";
|
||||
hash = "sha256-w44mynSAcxx9jpTfj/3LiB2eZKzOBzH2rBKzvXqKQJU=";
|
||||
version = "6.1.20";
|
||||
hash = "sha256-ni3AsoiDh/MZBhB0dQKFwcPnKSFvw8nhaX/09QCSQd8=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.2.3";
|
||||
hash = "sha256-C3Vwgk3UyD638CYeO2z+GBjmCTMVC2fwU7HyX8bxgxg=";
|
||||
version = "6.2.7";
|
||||
hash = "sha256-nxyEz+xXcr8tK8q+LWqNE3kYdWq4CXSy2vJfnlqKKRk=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-httpd";
|
||||
version = "2.4.55";
|
||||
version = "2.4.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "sha256-Eda6GeNsC5PKYuR+b/wtLyiElCaUvODyPznHG9xfaaw=";
|
||||
sha256 = "sha256-2NRfE5i6hO3QW7M8p1k6wpibF8ucegyv5UQtQa/bLXw=";
|
||||
};
|
||||
|
||||
# FIXME: -dev depends on -doc
|
||||
|
||||
Reference in New Issue
Block a user