public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05

This commit is contained in:
Martin Weinelt 2021-05-26 04:56:26 +02:00
parent 7e49e3ea89 65d4fff84d
commit af053d10fb
20 changed files with 948 additions and 892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/installation/installing.xml
View File

@ -46,6 +46,12 @@
to increase the font size. to increase the font size.
</para> </para>
<para>
To install over a serial port connect with <literal>115200n8</literal>
(e.g. <command>picocom -b 115200 /dev/ttyUSB0</command>). When the
bootloader lists boot entries, select the serial console boot entry.
</para>
<section xml:id="sec-installation-booting-networking"> <section xml:id="sec-installation-booting-networking">
<title>Networking in the installer</title> <title>Networking in the installer</title>

3
pkgs/applications/misc/girara/default.nix
View File

@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf";
}; };
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ]; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ];
buildInputs = [ libintl libiconv json_c ]; buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ]; propagatedBuildInputs = [ glib gtk ];
checkInputs = [ xvfb-run ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,20 +1,20 @@
{ {
"stable": { "stable": {
"version": "90.0.4430.212", "version": "91.0.4472.77",
"sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
"sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-02-09", "version": "2021-04-06",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", "rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
} }
}, },
"chromedriver": { "chromedriver": {
"version": "90.0.4430.24", "version": "91.0.4472.19",
"sha256_linux": "0byibxrs4ggid8qn5h72mmnw8l4y8xya2q1jbc6z74pmw8r9hkj7", "sha256_linux": "0pg9y55644i87qxa0983lvfizbmfiak9bg9249xhifl5kykghrb2",
"sha256_darwin": "0psll7vahj43jkj1wqq7mygf18l7ivp56ckc8wv4w5bnfmqv660k" "sha256_darwin": "07v5k07100vrzsbm6r59xg8j80ffzs3gnnf2kcfgqrzprx284gf2"
} }
}, },
"beta": { "beta": {

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.7.28", "version": "1.7.29",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.7.28"; version = "1.7.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "0p88gw1y37q35qqf94w3qlb84s2shm41n1pw5fgx0c0ymlzpl636"; sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s=";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.7.28"; version = "1.7.29";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "1adlpwq37yzmd3fq1pzbi476p4kr5hn5b5kwyd6cr5by0gsgkgyk"; sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE=";
}; };
installPhase = '' installPhase = ''

14
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{ {
"version": "13.11.2", "version": "13.12.0",
"repo_hash": "0xian17q8h5qdcvndyd27w278zqi3455svwycqfcv830g27c0csh", "repo_hash": "060bmfvpqh6zdrwdh4lx4xr1nbg0f7hcp8zh6k9qplv48szhj8m9",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.11.2-ee", "rev": "v13.12.0-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.11.2", "GITALY_SERVER_VERSION": "13.12.0",
"GITLAB_PAGES_VERSION": "1.38.0", "GITLAB_PAGES_VERSION": "1.39.0",
"GITLAB_SHELL_VERSION": "13.17.0", "GITLAB_SHELL_VERSION": "13.18.0",
"GITLAB_WORKHORSE_VERSION": "13.11.2" "GITLAB_WORKHORSE_VERSION": "13.12.0"
} }
} }

9
pkgs/applications/version-management/gitlab/default.nix
View File

@ -125,15 +125,6 @@ stdenv.mkDerivation {
patches = [ patches = [
# Change hardcoded paths to the NixOS equivalent # Change hardcoded paths to the NixOS equivalent
./remove-hardcoded-locations.patch ./remove-hardcoded-locations.patch
# Use the exactly 32 byte long version of db_key_base with
# aes-256-gcm, see
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
(fetchpatch {
name = "secrets_db_key_base_length.patch";
url = "https://gitlab.com/gitlab-org/gitlab/-/commit/a5c78650441c31a522b18e30177c717ffdd7f401.patch";
sha256 = "1qcxr5f59slgzmpcbiwabdhpz1lxnq98yngg1xkyihk2zhv0g1my";
})
]; ];
postPatch = '' postPatch = ''

6
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -21,17 +21,17 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.11.2"; version = "13.12.0";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qcrvNmnlrdJYXAlt65bA0Ij7zuX7QwVukC3A4KGL3sk="; sha256 = "sha256-MGK0WjAeqApf2xUsbF1mtyzYMhJHC5LFtj8LSb0NQKI=";
}; };
vendorSha256 = "sha256-VAXQPVyB+XdfOqGaT1H/83ed6xV+4Tr5fkBu1eyPe2k="; vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;

6
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,19 +2,19 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-shell"; pname = "gitlab-shell";
version = "13.17.0"; version = "13.18.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-j/80AIIJdRSisu2fNXcqazb4oIzAQP5CfxHX3l6yijY="; sha256 = "sha256-TPe2quDg/ljI2v1HciDajosSPm4Z/iT2skeveNdrKdo=";
}; };
buildInputs = [ ruby ]; buildInputs = [ ruby ];
patches = [ ./remove-hardcoded-locations.patch ]; patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-/jJTMtS5fcbQroWuaPPfvYxy6znNS0FOXVN7IcE/spQ="; vendorSha256 = "sha256-MvWpZ/Z9ieNE0+p975BG302BPzFbCZD3cACXMW5fiTQ=";
postInstall = '' postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "13.11.2"; version = "13.12.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse"; sourceRoot = "source/workhorse";
vendorSha256 = "sha256-m/Mx4Nr4tPK6yfcHxAFbjh9DI/1WnKReaaylWpNSrc8="; vendorSha256 = "sha256-JJN1KqqbP4fIW/k6LebIaWdYOmIzHqxCDgOKrkbB7Nw=";
buildInputs = [ git ]; buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}"; buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false; doCheck = false;

37
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -18,11 +18,14 @@ gem 'default_value_for', '~> 3.4.0'
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.1' gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.6.1' gem 'grape-path-helpers', '~> 1.6.3'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.10.0' gem 'marginalia', '~> 1.10.0'
# Authorization
gem 'declarative_policy', '~> 1.0.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.7.2' gem 'devise', '~> 4.7.2'
gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'bcrypt', '~> 3.1', '>= 3.1.14'
@ -46,7 +49,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4' gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0' gem 'omniauth_crowd', '~> 2.4.0'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'omniauth_openid_connect', '~> 0.3.5' gem 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-salesforce', '~> 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.16.0' gem 'rack-oauth2', '~> 1.16.0'
@ -89,7 +92,7 @@ gem 'net-ldap', '~> 0.16.3'
# API # API
gem 'grape', '~> 1.5.2' gem 'grape', '~> 1.5.2'
gem 'grape-entity', '~> 0.7.1' gem 'grape-entity', '~> 0.9.0'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
# GraphQL API # GraphQL API
@ -264,7 +267,7 @@ gem 'kubeclient', '~> 4.9.1'
# Sanitize user input # Sanitize user input
gem 'sanitize', '~> 5.2.1' gem 'sanitize', '~> 5.2.1'
gem 'babosa', '~> 1.0.2' gem 'babosa', '~> 1.0.4'
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@ -297,7 +300,7 @@ gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.4" gem 'gitlab-license', '~> 1.5'
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.3.0' gem 'rack-attack', '~> 6.3.0'
@ -306,12 +309,12 @@ gem 'rack-attack', '~> 6.3.0'
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing # PostgreSQL query parsing
gem 'pg_query', '~> 1.3.0' gem 'pg_query', '~> 2.0.3'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.16.2' gem 'gitlab-labkit', '~> 0.17.1'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.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 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0' gem 'thrift', '>= 0.14.0'
@ -343,6 +346,7 @@ end
group :development do group :development do
gem 'lefthook', '~> 0.7.0', require: false gem 'lefthook', '~> 0.7.0', require: false
gem 'solargraph', '~> 0.40.4', require: false
gem 'letter_opener_web', '~> 1.4.0' gem 'letter_opener_web', '~> 1.4.0'
@ -356,9 +360,9 @@ end
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3' gem 'bullet', '~> 6.1.3'
gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext'] gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote' gem 'pry-shell', '~> 0.4.0'
gem 'awesome_print', require: false gem 'awesome_print', require: false
@ -399,7 +403,7 @@ group :development, :test do
end end
group :development, :test, :danger do group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 1.1.1', require: false gem 'gitlab-dangerfiles', '~> 2.0.0', require: false
end end
group :development, :test, :coverage do group :development, :test, :coverage do
@ -413,13 +417,12 @@ group :development, :test, :omnibus do
end end
group :test do group :test do
gem 'json-schema', '~> 2.8.0'
gem 'fuubar', '~> 2.2.0' gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1' gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.34.0' gem 'capybara', '~> 3.35.3'
gem 'capybara-screenshot', '~> 1.0.22' gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.142'
@ -474,12 +477,15 @@ group :ed25519 do
gem 'bcrypt_pbkdf', '~> 1.0' gem 'bcrypt_pbkdf', '~> 1.0'
end end
# Spamcheck GRPC protocol definitions
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.11.0.pre.rc1' gem 'gitaly', '~> 13.12.0.pre.rc1'
gem 'grpc', '~> 1.30.2' gem 'grpc', '~> 1.30.2'
gem 'google-protobuf', '~> 3.14.0' gem 'google-protobuf', '~> 3.15.8'
gem 'toml-rb', '~> 1.0.0' gem 'toml-rb', '~> 1.0.0'
@ -488,7 +494,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5' gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.5.3' gem 'gitlab-experiment', '~> 0.5.4'
# Structured logging # Structured logging
gem 'lograge', '~> 0.5' gem 'lograge', '~> 0.5'
@ -512,6 +518,7 @@ gem 'erubi', '~> 1.9.0'
# See https://gitlab.com/gitlab-org/gitlab/issues/197386 # See https://gitlab.com/gitlab-org/gitlab/issues/197386
gem 'mail', '= 2.7.1' gem 'mail', '= 2.7.1'
# File encryption # File encryption
gem 'lockbox', '~> 0.6.2' gem 'lockbox', '~> 0.6.2'

141
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -125,11 +125,13 @@ GEM
faraday_middleware (~> 1.0.0.rc1) faraday_middleware (~> 1.0.0.rc1)
net-http-persistent (~> 4.0) net-http-persistent (~> 4.0)
nokogiri (~> 1.11.0.rc2) nokogiri (~> 1.11.0.rc2)
babosa (1.0.2) babosa (1.0.4)
backport (1.1.2)
base32 (0.3.2) base32 (0.3.2)
batch-loader (2.0.1) batch-loader (2.0.1)
bcrypt (3.1.16) bcrypt (3.1.16)
bcrypt_pbkdf (1.0.0) bcrypt_pbkdf (1.0.0)
benchmark (0.1.1)
benchmark-ips (2.3.0) benchmark-ips (2.3.0)
benchmark-memory (0.1.2) benchmark-memory (0.1.2)
memory_profiler (~> 0.9) memory_profiler (~> 0.9)
@ -153,13 +155,13 @@ GEM
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (>= 0.18, < 2) thor (>= 0.18, < 2)
byebug (11.1.3) byebug (11.1.3)
capybara (3.34.0) capybara (3.35.3)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
rack (>= 1.6.0) rack (>= 1.6.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (~> 1.5) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
capybara-screenshot (1.0.22) capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4) capybara (>= 1.0, < 4)
@ -238,6 +240,7 @@ GEM
html-pipeline html-pipeline
declarative (0.0.20) declarative (0.0.20)
declarative-option (0.1.0) declarative-option (0.1.0)
declarative_policy (1.0.0)
default_value_for (3.4.0) default_value_for (3.4.0)
activerecord (>= 3.2.0, < 7.0) activerecord (>= 3.2.0, < 7.0)
deprecation_toolkit (1.5.1) deprecation_toolkit (1.5.1)
@ -299,6 +302,7 @@ GEM
dry-equalizer (~> 0.3) dry-equalizer (~> 0.3)
dry-inflector (~> 0.1, >= 0.1.2) dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2) dry-logic (~> 1.0, >= 1.0.2)
e2mmap (0.1.0)
ecma-re-validator (0.2.1) ecma-re-validator (0.2.1)
regexp_parser (~> 1.2) regexp_parser (~> 1.2)
ed25519 (1.2.4) ed25519 (1.2.4)
@ -428,7 +432,7 @@ GEM
rails (>= 3.2.0) rails (>= 3.2.0)
git (1.7.0) git (1.7.0)
rchardet (~> 1.8) rchardet (~> 1.8)
gitaly (13.11.0.pre.rc1) gitaly (13.12.0.pre.rc1)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab (4.16.1) gitlab (4.16.1)
@ -436,10 +440,11 @@ GEM
terminal-table (~> 1.5, >= 1.5.1) terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-dangerfiles (1.1.1) gitlab-dangerfiles (2.0.0)
danger-gitlab danger-gitlab
gitlab-experiment (0.5.3) gitlab-experiment (0.5.4)
activesupport (>= 3.0) activesupport (>= 3.0)
request_store (>= 1.0)
scientist (~> 1.6, >= 1.6.0) scientist (~> 1.6, >= 1.6.0)
gitlab-fog-azure-rm (1.0.1) gitlab-fog-azure-rm (1.0.1)
azure-storage-blob (~> 2.0) azure-storage-blob (~> 2.0)
@ -455,21 +460,22 @@ GEM
fog-xml (~> 0.1.0) fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51) google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2) google-cloud-env (~> 1.2)
gitlab-labkit (0.16.2) gitlab-labkit (0.17.1)
actionpack (>= 5.0.0, < 7.0.0) actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19) grpc (~> 1.19)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
opentracing (~> 0.4) opentracing (~> 0.4)
pg_query (~> 1.3) pg_query (~> 2.0)
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.4.0) gitlab-license (1.5.0)
gitlab-mail_room (0.0.9) gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-pry-byebug (3.9.0) gitlab-omniauth-openid-connect (0.4.0)
byebug (~> 11.0) addressable (~> 2.7)
pry (~> 0.13.0) omniauth (~> 1.9)
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.5.6) gitlab-sidekiq-fetcher (0.5.6)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (6.2.0) gitlab-styles (6.2.0)
@ -503,9 +509,9 @@ GEM
signet (~> 0.12) signet (~> 0.12)
google-cloud-env (1.4.0) google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
google-protobuf (3.14.0) google-protobuf (3.15.8)
googleapis-common-protos-types (1.0.5) googleapis-common-protos-types (1.0.6)
google-protobuf (~> 3.11) google-protobuf (~> 3.14)
googleauth (0.14.0) googleauth (0.14.0)
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0) jwt (>= 1.4, < 3.0)
@ -522,10 +528,10 @@ GEM
mustermann-grape (~> 1.0.0) mustermann-grape (~> 1.0.0)
rack (>= 1.3.0) rack (>= 1.3.0)
rack-accept rack-accept
grape-entity (0.7.1) grape-entity (0.9.0)
activesupport (>= 4.0) activesupport (>= 3.0.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.6.1) grape-path-helpers (1.6.3)
activesupport activesupport
grape (~> 1.3) grape (~> 1.3)
rake (> 12) rake (> 12)
@ -626,6 +632,7 @@ GEM
jaeger-client (1.1.0) jaeger-client (1.1.0)
opentracing (~> 0.3) opentracing (~> 0.3)
thrift thrift
jaro_winkler (1.5.4)
jira-ruby (2.1.4) jira-ruby (2.1.4)
activesupport activesupport
atlassian-jwt atlassian-jwt
@ -641,8 +648,6 @@ GEM
activesupport (>= 4.2) activesupport (>= 4.2)
aes_key_wrap aes_key_wrap
bindata bindata
json-schema (2.8.1)
addressable (>= 2.4)
json_schemer (0.2.12) json_schemer (0.2.12)
ecma-re-validator (~> 0.2) ecma-re-validator (~> 0.2)
hana (~> 1.3) hana (~> 1.3)
@ -863,12 +868,8 @@ GEM
activesupport activesupport
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth_openid_connect (0.3.5)
addressable (~> 2.5)
omniauth (~> 1.9)
openid_connect (~> 1.1)
open4 (1.3.4) open4 (1.3.4)
openid_connect (1.1.8) openid_connect (1.2.0)
activemodel activemodel
attr_required (>= 1.0.0) attr_required (>= 1.0.0)
json-jwt (>= 1.5.0) json-jwt (>= 1.5.0)
@ -890,10 +891,13 @@ GEM
parser (3.0.0.0) parser (3.0.0.0)
ast (~> 2.4.1) ast (~> 2.4.1)
parslet (1.8.2) parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (1.3.0) pg_query (2.0.3)
google-protobuf (~> 3.15.5)
plist (3.6.0) plist (3.6.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
po_to_json (1.0.1) po_to_json (1.0.1)
@ -914,11 +918,15 @@ GEM
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
pry-remote (0.1.8) pry-shell (0.4.0)
pry (~> 0.9) pry (~> 0.13.0)
slop (~> 3.0) tty-markdown
tty-prompt
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.1.1) puma (5.1.1)
nio4r (~> 2.0) nio4r (~> 2.0)
@ -1184,9 +1192,24 @@ GEM
simplecov-html (0.12.2) simplecov-html (0.12.2)
sixarm_ruby_unaccent (1.2.0) sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.4) slack-messenger (2.3.4)
slop (3.6.0)
snowplow-tracker (0.6.1) snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11) contracts (~> 0.7, <= 0.11)
solargraph (0.40.4)
backport (~> 1.1)
benchmark
bundler (>= 1.17.2)
e2mmap
jaro_winkler (~> 1.5)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
parser (~> 3.0)
reverse_markdown (>= 1.0.5, < 3)
rubocop (>= 0.52)
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
spamcheck (0.1.0)
grpc (~> 1.0)
spring (2.1.1) spring (2.1.1)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
@ -1208,7 +1231,12 @@ GEM
state_machines-activerecord (0.8.0) state_machines-activerecord (0.8.0)
activerecord (>= 5.1) activerecord (>= 5.1)
state_machines-activemodel (>= 0.8.0) state_machines-activemodel (>= 0.8.0)
swd (1.1.2) strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
swd (1.2.0)
activesupport (>= 3) activesupport (>= 3)
attr_required (>= 0.0.5) attr_required (>= 0.0.5)
httpclient (>= 2.4) httpclient (>= 2.4)
@ -1254,6 +1282,23 @@ GEM
truncato (0.7.11) truncato (0.7.11)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0) nokogiri (>= 1.7.0, <= 2.0)
tty-color (0.6.0)
tty-cursor (0.7.1)
tty-markdown (0.7.0)
kramdown (>= 1.16.2, < 3.0)
pastel (~> 0.8)
rouge (~> 3.14)
strings (~> 0.2.0)
tty-color (~> 0.5)
tty-screen (~> 0.8)
tty-prompt (0.23.1)
pastel (~> 0.8)
tty-reader (~> 0.8)
tty-reader (0.9.0)
tty-cursor (~> 0.7)
tty-screen (~> 0.8)
wisper (~> 2.0)
tty-screen (0.8.1)
tzinfo (1.2.9) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
u2f (0.2.1) u2f (0.2.1)
@ -1322,12 +1367,14 @@ GEM
builder builder
expression_parser expression_parser
rinku rinku
wisper (2.0.1)
with_env (1.1.0) with_env (1.1.0)
wmi-lite (1.0.5) wmi-lite (1.0.5)
xml-simple (1.1.5) xml-simple (1.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yajl-ruby (1.4.1) yajl-ruby (1.4.1)
yard (0.9.26)
zeitwerk (2.4.2) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
@ -1353,7 +1400,7 @@ DEPENDENCIES
aws-sdk-cloudformation (~> 1) aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3) aws-sdk-core (~> 3)
aws-sdk-s3 (~> 1) aws-sdk-s3 (~> 1)
babosa (~> 1.0.2) babosa (~> 1.0.4)
base32 (~> 0.3.0) base32 (~> 0.3.0)
batch-loader (~> 2.0.1) batch-loader (~> 2.0.1)
bcrypt (~> 3.1, >= 3.1.14) bcrypt (~> 3.1, >= 3.1.14)
@ -1366,7 +1413,7 @@ DEPENDENCIES
browser (~> 4.2) browser (~> 4.2)
bullet (~> 6.1.3) bullet (~> 6.1.3)
bundler-audit (~> 0.7.0.1) bundler-audit (~> 0.7.0.1)
capybara (~> 3.34.0) capybara (~> 3.35.3)
capybara-screenshot (~> 1.0.22) capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3) carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7) charlock_holmes (~> 0.7.7)
@ -1378,6 +1425,7 @@ DEPENDENCIES
crystalball (~> 0.7.0) crystalball (~> 0.7.0)
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1) deckar01-task_list (= 2.3.1)
declarative_policy (~> 1.0.0)
default_value_for (~> 3.4.0) default_value_for (~> 3.4.0)
deprecation_toolkit (~> 1.5.1) deprecation_toolkit (~> 1.5.1)
derailed_benchmarks derailed_benchmarks
@ -1418,30 +1466,30 @@ DEPENDENCIES
gettext (~> 3.3) gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly (~> 13.11.0.pre.rc1) gitaly (~> 13.12.0.pre.rc1)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 1.1.1) gitlab-dangerfiles (~> 2.0.0)
gitlab-experiment (~> 0.5.3) gitlab-experiment (~> 0.5.4)
gitlab-fog-azure-rm (~> 1.0.1) gitlab-fog-azure-rm (~> 1.0.1)
gitlab-fog-google (~> 1.13) gitlab-fog-google (~> 1.13)
gitlab-labkit (~> 0.16.2) gitlab-labkit (~> 0.17.1)
gitlab-license (~> 1.4) gitlab-license (~> 1.5)
gitlab-mail_room (~> 0.0.9) gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug gitlab-omniauth-openid-connect (~> 0.4.0)
gitlab-sidekiq-fetcher (= 0.5.6) gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0) gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0) gon (~> 6.4.0)
google-api-client (~> 0.33) google-api-client (~> 0.33)
google-protobuf (~> 3.14.0) google-protobuf (~> 3.15.8)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
grape (~> 1.5.2) grape (~> 1.5.2)
grape-entity (~> 0.7.1) grape-entity (~> 0.9.0)
grape-path-helpers (~> 1.6.1) grape-path-helpers (~> 1.6.3)
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
@ -1465,7 +1513,6 @@ DEPENDENCIES
jira-ruby (~> 2.1.4) jira-ruby (~> 2.1.4)
js_regex (~> 3.4) js_regex (~> 3.4)
json (~> 2.3.0) json (~> 2.3.0)
json-schema (~> 2.8.0)
json_schemer (~> 0.2.12) json_schemer (~> 0.2.12)
jwt (~> 2.1.0) jwt (~> 2.1.0)
kaminari (~> 1.0) kaminari (~> 1.0)
@ -1513,18 +1560,18 @@ DEPENDENCIES
omniauth-shibboleth (~> 1.3.0) omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4) omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.4.0) omniauth_crowd (~> 2.4.0)
omniauth_openid_connect (~> 0.3.5)
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
parallel (~> 1.19) parallel (~> 1.19)
parslet (~> 1.8) parslet (~> 1.8)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
pg_query (~> 1.3.0) pg_query (~> 2.0.3)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0) prometheus-client-mmap (~> 0.12.0)
pry-byebug
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-remote pry-shell (~> 0.4.0)
puma (~> 5.1.1) puma (~> 5.1.1)
puma_worker_killer (~> 0.3.1) puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3) rack (~> 2.2.3)
@ -1579,6 +1626,8 @@ DEPENDENCIES
simplecov-cobertura (~> 1.3.1) simplecov-cobertura (~> 1.3.1)
slack-messenger (~> 2.3.4) slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1) snowplow-tracker (~> 0.6.1)
solargraph (~> 0.40.4)
spamcheck (~> 0.1.0)
spring (~> 2.1.0) spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4) spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0) sprockets (~> 3.7.0)

313
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -455,10 +455,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq";
type = "gem"; type = "gem";
}; };
version = "1.0.2"; version = "1.0.4";
};
backport = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
type = "gem";
};
version = "1.1.2";
}; };
base32 = { base32 = {
groups = ["default"]; groups = ["default"];
@ -500,6 +510,16 @@
}; };
version = "1.0.0"; version = "1.0.0";
}; };
benchmark = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
type = "gem";
};
version = "0.1.1";
};
benchmark-ips = { benchmark-ips = {
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
@ -636,10 +656,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i1bm7r8n67cafd9p3ck7vdmng921b41n9znvlfaz7cy8a3gsrgm"; sha256 = "1viqcpsngy9fqjd68932m43ad6xj656d1x33nx9565q57chgi29k";
type = "gem"; type = "gem";
}; };
version = "3.34.0"; version = "3.35.3";
}; };
capybara-screenshot = { capybara-screenshot = {
dependencies = ["capybara" "launchy"]; dependencies = ["capybara" "launchy"];
@ -1014,6 +1034,16 @@
}; };
version = "0.1.0"; version = "0.1.0";
}; };
declarative_policy = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k2wl0jr0jq64gy7ibb1ipm2dzqil7y66vyffwx81g7sqchh7xh6";
type = "gem";
};
version = "1.0.0";
};
default_value_for = { default_value_for = {
dependencies = ["activerecord"]; dependencies = ["activerecord"];
groups = ["default"]; groups = ["default"];
@ -1248,6 +1278,16 @@
}; };
version = "1.4.0"; version = "1.4.0";
}; };
e2mmap = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
type = "gem";
};
version = "0.1.0";
};
ecma-re-validator = { ecma-re-validator = {
dependencies = ["regexp_parser"]; dependencies = ["regexp_parser"];
groups = ["default"]; groups = ["default"];
@ -1851,10 +1891,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hbc2frfyxxlar9ggpnl4x090nw1nlriazzkdgjz3r4mx4ihja1b"; sha256 = "1l0zq04lhqbzg0grca1c0p3a5gb9jdlhy41dhlgnrsaf7k6xads6";
type = "gem"; type = "gem";
}; };
version = "13.11.0.pre.rc1"; version = "13.12.0.pre.rc1";
}; };
github-markup = { github-markup = {
groups = ["default"]; groups = ["default"];
@ -1894,21 +1934,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ivkbq50fhm39zwyfac4q3y0qkrsk3hmrk1ggyhz1yphkq38qvq7"; sha256 = "0h40p9v034jczialkh4brrv7karrx6a95mhrfpfs17p800lighzz";
type = "gem"; type = "gem";
}; };
version = "1.1.1"; version = "2.0.0";
}; };
gitlab-experiment = { gitlab-experiment = {
dependencies = ["activesupport" "scientist"]; dependencies = ["activesupport" "request_store" "scientist"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ccjmm10pjvpzy5m7b86mxd2mg2x0k4y0c4cim0r4y7sy2c115mz"; sha256 = "18xc1785b9h0vwlqgi2m0mhjim6jaqqpi8nnl4hh8mbjd4d6kf1j";
type = "gem"; type = "gem";
}; };
version = "0.5.3"; version = "0.5.4";
}; };
gitlab-fog-azure-rm = { gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1938,20 +1978,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469";
type = "gem"; type = "gem";
}; };
version = "0.16.2"; version = "0.17.1";
}; };
gitlab-license = { gitlab-license = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1rfyxchshl2h0c2dpsy1wa751l02i22nv5mkhygfwnbi0ndkzqmg"; sha256 = "07qcbdrxqwbri0kgiamrvx9y7cii3smf94g6scgn2l369m6955x1";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.5.0";
}; };
gitlab-mail_room = { gitlab-mail_room = {
groups = ["default"]; groups = ["default"];
@ -1983,20 +2023,16 @@
}; };
version = "0.9.1"; version = "0.9.1";
}; };
gitlab-pry-byebug = { gitlab-omniauth-openid-connect = {
dependencies = ["byebug" "pry"]; dependencies = ["addressable" "omniauth" "openid_connect"];
groups = ["development" "test"]; groups = ["default"];
platforms = [{ platforms = [];
engine = "maglev";
} {
engine = "ruby";
}];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sp33vzzw8b7q9d8kb4pw8cl5fzlbffdpwz125x1g3kdiwz8xp3j"; sha256 = "16vbdyp2ml2i59xnpk0w5grh441kxcdpr639yzv69brjnrf3h9di";
type = "gem"; type = "gem";
}; };
version = "3.9.0"; version = "0.4.0";
}; };
gitlab-sidekiq-fetcher = { gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"]; dependencies = ["sidekiq"];
@ -2091,10 +2127,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; sha256 = "0d9ayd4c69iag9nny7yydjx6dw4ymd52x1kv917ngv3vmsdkv51x";
type = "gem"; type = "gem";
}; };
version = "3.14.0"; version = "3.15.8";
}; };
googleapis-common-protos-types = { googleapis-common-protos-types = {
dependencies = ["google-protobuf"]; dependencies = ["google-protobuf"];
@ -2102,10 +2138,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji"; sha256 = "0074jk8fdl5rh7hfgx00n17sg493xrylkjkslx2d7cj5mk6hwn7d";
type = "gem"; type = "gem";
}; };
version = "1.0.5"; version = "1.0.6";
}; };
googleauth = { googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@ -2146,10 +2182,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9"; sha256 = "0sqk33djlyvkinj0vxblfcib86bk9dy0iq2c3j2yalxyrpns3kfr";
type = "gem"; type = "gem";
}; };
version = "0.7.1"; version = "0.9.0";
}; };
grape-path-helpers = { grape-path-helpers = {
dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"];
@ -2157,10 +2193,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xdp7b5fnvm89szy8ghpl6wm125iq7f0qnhibj5bxqrvg3xyhc2m"; sha256 = "1jbajciakiq9wwax2x11jzhmwzkcpkb4c0gfl01aj8a3l99gvgs9";
type = "gem"; type = "gem";
}; };
version = "1.6.1"; version = "1.6.3";
}; };
grape_logging = { grape_logging = {
dependencies = ["grape" "rack"]; dependencies = ["grape" "rack"];
@ -2566,6 +2602,16 @@
}; };
version = "1.1.0"; version = "1.1.0";
}; };
jaro_winkler = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
type = "gem";
};
version = "1.5.4";
};
jira-ruby = { jira-ruby = {
dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
groups = ["default"]; groups = ["default"];
@ -2619,17 +2665,6 @@
}; };
version = "1.13.0"; version = "1.13.0";
}; };
json-schema = {
dependencies = ["addressable"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5";
type = "gem";
};
version = "2.8.1";
};
json_schemer = { json_schemer = {
dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"];
groups = ["default"]; groups = ["default"];
@ -3620,17 +3655,6 @@
}; };
version = "2.4.0"; version = "2.4.0";
}; };
omniauth_openid_connect = {
dependencies = ["addressable" "omniauth" "openid_connect"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wxf52yggvwmyg6f9fiykh1sk51xx34i6x6m8f06ia56npslc4aw";
type = "gem";
};
version = "0.3.5";
};
open4 = { open4 = {
groups = ["default" "development"]; groups = ["default" "development"];
platforms = []; platforms = [];
@ -3647,10 +3671,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0r50vwf9hsf6r8gx5mwqs3w3w92l864ikiz9d0fcibqsr1489pbg"; sha256 = "1nqhgvq006h6crbp8lffw66ll46zf319c2637g4sybdclglismma";
type = "gem"; type = "gem";
}; };
version = "1.1.8"; version = "1.2.0";
}; };
openssl = { openssl = {
groups = ["default"]; groups = ["default"];
@ -3754,6 +3778,17 @@
}; };
version = "1.8.2"; version = "1.8.2";
}; };
pastel = {
dependencies = ["tty-color"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8";
type = "gem";
};
version = "0.8.0";
};
peek = { peek = {
dependencies = ["railties"]; dependencies = ["railties"];
groups = ["default"]; groups = ["default"];
@ -3776,14 +3811,15 @@
version = "1.2.3"; version = "1.2.3";
}; };
pg_query = { pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "2.0.3";
}; };
plist = { plist = {
groups = ["default"]; groups = ["default"];
@ -3884,6 +3920,17 @@
}; };
version = "0.13.1"; version = "0.13.1";
}; };
pry-byebug = {
dependencies = ["byebug" "pry"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv";
type = "gem";
};
version = "3.9.0";
};
pry-rails = { pry-rails = {
dependencies = ["pry"]; dependencies = ["pry"];
groups = ["development" "test"]; groups = ["development" "test"];
@ -3895,16 +3942,16 @@
}; };
version = "0.3.9"; version = "0.3.9";
}; };
pry-remote = { pry-shell = {
dependencies = ["pry" "slop"]; dependencies = ["pry" "tty-markdown" "tty-prompt"];
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; sha256 = "1315j8klxd404xxmcw1c6rlx7j445dzx62q5sggzvd59sl1amkf5";
type = "gem"; type = "gem";
}; };
version = "0.1.8"; version = "0.4.0";
}; };
public_suffix = { public_suffix = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -5078,16 +5125,6 @@
}; };
version = "2.3.4"; version = "2.3.4";
}; };
slop = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
type = "gem";
};
version = "3.6.0";
};
snowplow-tracker = { snowplow-tracker = {
dependencies = ["contracts"]; dependencies = ["contracts"];
groups = ["default"]; groups = ["default"];
@ -5099,6 +5136,28 @@
}; };
version = "0.6.1"; version = "0.6.1";
}; };
solargraph = {
dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xrad7amwf3nmdbif566qprk6xvwydxwz0s7arnzpvr01anc9gcl";
type = "gem";
};
version = "0.40.4";
};
spamcheck = {
dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n307r7y819gq21yqhlni3r455cgcg3nc5318rhhx1bs99qs793r";
type = "gem";
};
version = "0.1.0";
};
spring = { spring = {
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
@ -5214,16 +5273,37 @@
}; };
version = "0.8.0"; version = "0.8.0";
}; };
strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk";
type = "gem";
};
version = "0.2.1";
};
strings-ansi = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
type = "gem";
};
version = "0.2.0";
};
swd = { swd = {
dependencies = ["activesupport" "attr_required" "httpclient"]; dependencies = ["activesupport" "attr_required" "httpclient"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd"; sha256 = "0c5cdpykx2h4jx8q01hjhv8f0plw5r9iqm2i1m0ijiyk7dqm824w";
type = "gem"; type = "gem";
}; };
version = "1.1.2"; version = "1.2.0";
}; };
sys-filesystem = { sys-filesystem = {
dependencies = ["ffi"]; dependencies = ["ffi"];
@ -5465,6 +5545,69 @@
}; };
version = "0.7.11"; version = "0.7.11";
}; };
tty-color = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g";
type = "gem";
};
version = "0.6.0";
};
tty-cursor = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
type = "gem";
};
version = "0.7.1";
};
tty-markdown = {
dependencies = ["kramdown" "pastel" "rouge" "strings" "tty-color" "tty-screen"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hp6b6mcawg563098gs93wr49xmg871lkaj8m8gwk2va3zvqw7i5";
type = "gem";
};
version = "0.7.0";
};
tty-prompt = {
dependencies = ["pastel" "tty-reader"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw";
type = "gem";
};
version = "0.23.1";
};
tty-reader = {
dependencies = ["tty-cursor" "tty-screen" "wisper"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6";
type = "gem";
};
version = "0.9.0";
};
tty-screen = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
type = "gem";
};
version = "0.8.1";
};
tzinfo = { tzinfo = {
dependencies = ["thread_safe"]; dependencies = ["thread_safe"];
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -5751,6 +5894,16 @@
}; };
version = "0.8.1"; version = "0.8.1";
}; };
wisper = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf";
type = "gem";
};
version = "2.0.1";
};
with_env = { with_env = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
@ -5802,6 +5955,16 @@
}; };
version = "1.4.1"; version = "1.4.1";
}; };
yard = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
type = "gem";
};
version = "0.9.26";
};
zeitwerk = { zeitwerk = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];

8
pkgs/applications/version-management/gitlab/update.py
View File

@ -131,9 +131,11 @@ def update_rubyenv():
data = _get_data_json() data = _get_data_json()
rev = data['rev'] rev = data['rev']
for fn in ['Gemfile.lock', 'Gemfile']: with open(rubyenv_dir / 'Gemfile.lock', 'w') as f:
with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file('Gemfile.lock', rev))
f.write(repo.get_file(fn, rev)) with open(rubyenv_dir / 'Gemfile', 'w') as f:
original = repo.get_file('Gemfile', rev)
f.write(re.sub(r".*mail-smtp_pool.*", "", original))
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir)

1248
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/development/python-modules/pywemo/default.nix
View File

@ -47,6 +47,11 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
# https://github.com/NixOS/nixpkgs/issues/124165
"test_bridge_getdevicestatus"
];
pythonImportsCheck = [ "pywemo" ]; pythonImportsCheck = [ "pywemo" ];
meta = with lib; { meta = with lib; {

4
pkgs/servers/http/nginx/mainline.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... }@args: { callPackage, ... }@args:
callPackage ./generic.nix args { callPackage ./generic.nix args {
version = "1.20.0"; version = "1.21.0";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; sha256 = "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy";
} }

4
pkgs/servers/http/nginx/stable.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix args { callPackage ./generic.nix args {
version = "1.20.0"; version = "1.20.1";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; sha256 = "0jccnknx57yvbvx6qwwisa8rb5zm1wb54xnz0nm0phym6cay2qp4";
} }

4
pkgs/servers/misc/navidrome/default.nix
View File

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "navidrome"; pname = "navidrome";
version = "0.42.1"; version = "0.43.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv"; sha256 = "0y7a5n8phffxga1bjkaf7x5ijripqg1nfjljkrrj26778550vqb5";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];