Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-25 12:06:04 +00:00 committed by GitHub
commit bae6b2055f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 940 additions and 642 deletions

View file

@ -161,6 +161,7 @@ with lib.maintainers; {
ekleog
ralith
mjlbach
dandellion
];
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
};

View file

@ -10,7 +10,7 @@ let
postgresqlPackage = if config.services.postgresql.enable then
config.services.postgresql.package
else
pkgs.postgresql;
pkgs.postgresql_12;
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
@ -841,6 +841,10 @@ in {
assertion = cfg.secrets.jwsFile != null;
message = "services.gitlab.secrets.jwsFile must be set!";
}
{
assertion = versionAtLeast postgresqlPackage.version "12.0.0";
message = "PostgreSQL >=12 is required to run GitLab 14.";
}
];
environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];

View file

@ -432,6 +432,7 @@ in
trezord = handleTest ./trezord.nix {};
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
ucarp = handleTest ./ucarp.nix {};

View file

@ -104,6 +104,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
# Exit Sway and verify process exit status 0:
machine.succeed("su - alice -c 'swaymsg exit || true'")
machine.wait_until_fails("pgrep -x sway")
# TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test:
# machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000]
# machine.wait_for_file("/tmp/sway-exit-ok")

View file

@ -0,0 +1,27 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "txredisapi";
meta = with pkgs.lib.maintainers; {
maintainers = [ dandellion ];
};
nodes = {
machine =
{ pkgs, ... }:
{
services.redis.enable = true;
services.redis.unixSocket = "/run/redis/redis.sock";
environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
};
};
testScript = ''
start_all()
machine.wait_for_unit("redis")
machine.wait_for_open_port("6379")
tests = machine.succeed("PYTHONPATH=\"${pkgs.python3Packages.txredisapi.src}\" python -m twisted.trial ${pkgs.python3Packages.txredisapi.src}/tests")
'';
})

View file

@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "1.0.1";
version = "1.1.0";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "megapixels";
rev = version;
sha256 = "0k9a5dpr5z0g7ngbhk4j22sbs1ffxiwg8wmbzgggdc9xvwmkgppr";
sha256 = "0y56c6vchlzidfmp3a3bdc228vbhy7zaxvmhkyxchfb752yzr0n3";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];

View file

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "opentx";
version = "2.3.11";
version = "2.3.13";
src = fetchFromGitHub {
owner = "opentx";
repo = "opentx";
rev = "release/${version}";
sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU=";
sha256 = "sha256-Bi/Cz2T2NdtnJZHav8qvo+gErPsR8Ym7K3KcD5APt6Y=";
};
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

View file

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.37";
version = "1.8.39";
src = fetchPypi {
inherit pname version;
sha256 = "0527c65b55652a130c44c131cce5644cc5ac00a3f85edb81899f79f5e3ee16fb";
sha256 = "sha256-1RXuAiz9i5ZnLtDGQ+o3DNgWJ2FDJGIoelmlDmEzrts=";
};
postPatch = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.3.2";
version = "3.4.0";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
sha256 = "sha256-tqlJANxJl2r0ZxPb7d8KU9cRMQUFPUIm/zMp4zREGL0=";
sha256 = "sha256-GNUpSK9cczGISyvo05KrLzeO+zRm5dEYOmX2Oy7TjzE=";
};
buildCommand = ''

View file

@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.2.0";
version = "3.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8";
sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h";
};
nativeBuildInputs = [ installShellFiles pbr ];

View file

@ -1,13 +1,13 @@
{
"version": "13.12.4",
"repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i",
"version": "14.0.1",
"repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.12.4-ee",
"rev": "v14.0.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.12.4",
"GITLAB_PAGES_VERSION": "1.39.0",
"GITLAB_SHELL_VERSION": "13.18.0",
"GITLAB_WORKHORSE_VERSION": "13.12.4"
"GITALY_SERVER_VERSION": "14.0.1",
"GITLAB_PAGES_VERSION": "1.40.0",
"GITLAB_SHELL_VERSION": "13.19.0",
"GITLAB_WORKHORSE_VERSION": "14.0.1"
}
}

View file

@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.16.2'
gem 'gitlab-labkit', '~> 0.17.1'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE

View file

@ -65,13 +65,13 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
gitlab-labkit (0.16.2)
gitlab-labkit (0.17.1)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 1.3)
pg_query (~> 2.0)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.14.0)
@ -104,11 +104,11 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
mini_portile2 (2.5.1)
minitest (5.14.2)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.11.1)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (1.5.0)
@ -121,7 +121,8 @@ GEM
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
pg_query (1.3.0)
pg_query (2.0.3)
google-protobuf (~> 3.15.5)
proc_to_ast (0.1.0)
coderay
parser
@ -221,7 +222,7 @@ DEPENDENCIES
github-linguist (~> 7.12)
gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
gitlab-labkit (~> 0.16.2)
gitlab-labkit (~> 0.17.1)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.14.0)
grpc (~> 1.30.2)

View file

@ -21,17 +21,17 @@ let
};
};
in buildGoModule rec {
version = "13.12.4";
version = "14.0.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0=";
sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY=";
};
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
passthru = {
inherit rubyEnv;

View file

@ -269,10 +269,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469";
type = "gem";
};
version = "0.16.2";
version = "0.17.1";
};
gitlab-markup = {
groups = ["default"];
@ -441,10 +441,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
type = "gem";
};
version = "2.5.0";
version = "2.5.1";
};
minitest = {
groups = ["default" "development" "test"];
@ -482,10 +482,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
type = "gem";
};
version = "1.11.1";
version = "1.11.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@ -549,14 +549,15 @@
version = "2.7.2.0";
};
pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag";
type = "gem";
};
version = "1.3.0";
version = "2.0.3";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];

View file

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

View file

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

View file

@ -2,7 +2,7 @@
source 'https://rubygems.org'
gem 'rails', '~> 6.0.3.6'
gem 'rails', '~> 6.1.3.2'
gem 'bootsnap', '~> 1.4.6'
@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false
gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false
# for Google storage
gem 'google-api-client', '~> 0.33'
@ -183,13 +183,8 @@ gem 'rack', '~> 2.2.3'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :unicorn do
gem 'unicorn', '~> 5.5'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
group :puma do
gem 'puma', '~> 5.1.1', require: false
gem 'puma', '~> 5.3.1', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
end
@ -254,7 +249,7 @@ gem 'flowdock', '~> 0.7'
gem 'slack-messenger', '~> 2.3.4'
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
# Asana integration
gem 'asana', '~> 0.10.3'
@ -306,15 +301,20 @@ gem 'gitlab-license', '~> 1.5'
gem 'rack-attack', '~> 6.3.0'
# Sentry integration
gem 'sentry-raven', '~> 3.0'
gem 'sentry-raven', '~> 3.1'
# PostgreSQL query parsing
gem 'pg_query', '~> 1.3.0'
#
# We need this fork until https://github.com/pganalyze/pg_query/pull/212
# and https://github.com/pganalyze/pg_query/pull/213 are
# released. gitlab-labkit will need to be updated to use the pg_query
# version.
gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.16.2'
gem 'gitlab-labkit', '~> 0.18.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@ -341,12 +341,11 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.12.0'
gem 'raindrops', '~> 0.18'
end
group :development do
gem 'lefthook', '~> 0.7.0', require: false
gem 'solargraph', '~> 0.40.4', require: false
gem 'solargraph', '~> 0.42', require: false
gem 'letter_opener_web', '~> 1.4.0'
@ -403,7 +402,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 2.0.0', require: false
gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
end
group :development, :test, :coverage do
@ -481,18 +480,21 @@ end
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.12.0.pre.rc1'
gem 'gitaly', '~> 14.0.0.pre.rc2'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.30.2'
gem 'google-protobuf', '~> 3.14.0'
gem 'google-protobuf', '~> 3.17.1'
gem 'toml-rb', '~> 1.0.0'
# Feature toggles
gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.5.4'

View file

@ -5,64 +5,68 @@ GEM
abstract_type (0.0.7)
acme-client (2.0.6)
faraday (>= 0.17, < 2.0.0)
actioncable (6.0.3.6)
actionpack (= 6.0.3.6)
actioncable (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.6)
actionpack (= 6.0.3.6)
activejob (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
actionmailbox (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (>= 2.7.1)
actionmailer (6.0.3.6)
actionpack (= 6.0.3.6)
actionview (= 6.0.3.6)
activejob (= 6.0.3.6)
actionmailer (6.1.3.2)
actionpack (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.6)
actionview (= 6.0.3.6)
activesupport (= 6.0.3.6)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.3.2)
actionview (= 6.1.3.2)
activesupport (= 6.1.3.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)
actiontext (6.0.3.6)
actionpack (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
actiontext (6.1.3.2)
actionpack (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
nokogiri (>= 1.8.5)
actionview (6.0.3.6)
activesupport (= 6.0.3.6)
actionview (6.1.3.2)
activesupport (= 6.1.3.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.6)
activesupport (= 6.0.3.6)
activejob (6.1.3.2)
activesupport (= 6.1.3.2)
globalid (>= 0.3.6)
activemodel (6.0.3.6)
activesupport (= 6.0.3.6)
activerecord (6.0.3.6)
activemodel (= 6.0.3.6)
activesupport (= 6.0.3.6)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
activestorage (6.0.3.6)
actionpack (= 6.0.3.6)
activejob (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activesupport (= 6.1.3.2)
marcel (~> 1.0.0)
activesupport (6.0.3.6)
mini_mime (~> 1.0.2)
activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
acts-as-taggable-on (7.0.0)
activerecord (>= 5.0, < 6.2)
adamantium (0.2.0)
@ -126,7 +130,7 @@ GEM
net-http-persistent (~> 4.0)
nokogiri (~> 1.11.0.rc2)
babosa (1.0.4)
backport (1.1.2)
backport (1.2.0)
base32 (0.3.2)
batch-loader (2.0.1)
bcrypt (3.1.16)
@ -341,13 +345,24 @@ GEM
factory_bot_rails (6.1.0)
factory_bot (~> 6.1.0)
railties (>= 5.0.0)
faraday (1.0.1)
faraday (1.4.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
faraday_middleware-aws-sigv4 (0.3.0)
@ -359,19 +374,19 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
ffi (1.13.1)
ffi (1.15.1)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
flipper (0.17.1)
flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7)
flipper (~> 0.17.1)
flipper-active_support_cache_store (0.17.1)
activesupport (>= 4.2, < 7)
flipper (~> 0.17.1)
flipper (0.21.0)
flipper-active_record (0.21.0)
activerecord (>= 5.0, < 7)
flipper (~> 0.21.0)
flipper-active_support_cache_store (0.21.0)
activesupport (>= 5.0, < 7)
flipper (~> 0.21.0)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@ -432,7 +447,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (13.12.0.pre.rc1)
gitaly (14.0.0.pre.rc2)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -440,13 +455,13 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (2.0.0)
gitlab-dangerfiles (2.1.2)
danger-gitlab
gitlab-experiment (0.5.4)
activesupport (>= 3.0)
request_store (>= 1.0)
scientist (~> 1.6, >= 1.6.0)
gitlab-fog-azure-rm (1.0.1)
gitlab-fog-azure-rm (1.1.1)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
@ -460,13 +475,13 @@ GEM
fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
gitlab-labkit (0.16.2)
gitlab-labkit (0.18.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
gitlab-pg_query (~> 2.0)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.5.0)
gitlab-mail_room (0.0.9)
@ -476,6 +491,8 @@ GEM
addressable (~> 2.7)
omniauth (~> 1.9)
openid_connect (~> 1.2)
gitlab-pg_query (2.0.4)
google-protobuf (>= 3.17.1)
gitlab-sidekiq-fetcher (0.5.6)
sidekiq (~> 5)
gitlab-styles (6.2.0)
@ -509,7 +526,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.14.0)
google-protobuf (3.17.1)
googleapis-common-protos-types (1.0.6)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@ -615,7 +632,7 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.3.0)
http-parser (1.2.1)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
httparty (0.16.4)
mime-types (~> 3.0)
@ -669,7 +686,8 @@ GEM
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kgio (2.11.3)
kas-grpc (0.0.2)
grpc (~> 1.0)
knapsack (1.21.1)
rake
kramdown (2.3.1)
@ -683,7 +701,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (0.7.2)
lefthook (0.7.5)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (1.4.0)
@ -735,7 +753,7 @@ GEM
mime-types-data (3.2020.0512)
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.1.0)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.11.3)
mixlib-cli (2.1.8)
@ -896,7 +914,6 @@ GEM
peek (1.1.0)
railties (>= 4.0.0)
pg (1.2.3)
pg_query (1.3.0)
plist (3.6.0)
png_quantizator (0.2.1)
po_to_json (1.0.1)
@ -922,12 +939,12 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-shell (0.4.0)
pry-shell (0.4.1)
pry (~> 0.13.0)
tty-markdown
tty-prompt
public_suffix (4.0.6)
puma (5.1.1)
puma (5.3.2)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
@ -955,20 +972,20 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.2)
rails (6.0.3.6)
actioncable (= 6.0.3.6)
actionmailbox (= 6.0.3.6)
actionmailer (= 6.0.3.6)
actionpack (= 6.0.3.6)
actiontext (= 6.0.3.6)
actionview (= 6.0.3.6)
activejob (= 6.0.3.6)
activemodel (= 6.0.3.6)
activerecord (= 6.0.3.6)
activestorage (= 6.0.3.6)
activesupport (= 6.0.3.6)
bundler (>= 1.3.0)
railties (= 6.0.3.6)
rails (6.1.3.2)
actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.2)
actiontext (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activemodel (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
bundler (>= 1.15.0)
railties (= 6.1.3.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
@ -982,14 +999,13 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (6.0.3.6)
actionpack (= 6.0.3.6)
activesupport (= 6.0.3.6)
railties (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (~> 1.0)
rainbow (3.0.0)
raindrops (0.19.1)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
@ -1123,7 +1139,7 @@ GEM
nokogiri (>= 1.10.5)
rexml
ruby-statistics (2.1.2)
ruby2_keywords (0.0.2)
ruby2_keywords (0.0.4)
ruby_parser (3.15.0)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
@ -1162,7 +1178,7 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-raven (3.0.4)
sentry-raven (3.1.2)
faraday (>= 1.0)
settingslogic (2.0.9)
sexp_processor (4.15.1)
@ -1193,10 +1209,11 @@ GEM
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
solargraph (0.40.4)
backport (~> 1.1)
solargraph (0.42.3)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
diff-lcs (~> 1.4)
e2mmap
jaro_winkler (~> 1.5)
kramdown (~> 2.3)
@ -1248,8 +1265,8 @@ GEM
terser (1.0.2)
execjs (>= 0.3.0, < 3)
test-prof (0.12.0)
test_file_finder (0.1.3)
faraday (~> 1.0.1)
test_file_finder (0.1.4)
faraday (~> 1.0)
text (1.3.1)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
@ -1298,8 +1315,8 @@ GEM
tty-screen (~> 0.8)
wisper (~> 2.0)
tty-screen (0.8.1)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
u2f (0.2.1)
uber (0.1.0)
unf (0.1.4)
@ -1307,12 +1324,6 @@ GEM
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
unicorn (5.5.5)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.13.0)
unleash (0.1.5)
murmurhash3 (~> 0.1.6)
@ -1449,9 +1460,9 @@ DEPENDENCIES
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
ffaker (~> 2.10)
flipper (~> 0.17.1)
flipper-active_record (~> 0.17.1)
flipper-active_support_cache_store (~> 0.17.1)
flipper (~> 0.21.0)
flipper-active_record (~> 0.21.0)
flipper-active_support_cache_store (~> 0.21.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.9)
@ -1465,26 +1476,27 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 13.12.0.pre.rc1)
gitaly (~> 14.0.0.pre.rc2)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 2.0.0)
gitlab-dangerfiles (~> 2.1.2)
gitlab-experiment (~> 0.5.4)
gitlab-fog-azure-rm (~> 1.0.1)
gitlab-fog-azure-rm (~> 1.1.1)
gitlab-fog-google (~> 1.13)
gitlab-labkit (~> 0.16.2)
gitlab-labkit (~> 0.18.0)
gitlab-license (~> 1.5)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.4.0)
gitlab-pg_query (~> 2.0.4)
gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0)
google-api-client (~> 0.33)
google-protobuf (~> 3.14.0)
google-protobuf (~> 3.17.1)
gpgme (~> 2.0.19)
grape (~> 1.5.2)
grape-entity (~> 0.9.0)
@ -1515,6 +1527,7 @@ DEPENDENCIES
json_schemer (~> 0.2.12)
jwt (~> 2.1.0)
kaminari (~> 1.0)
kas-grpc (~> 0.0.2)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.9.1)
@ -1564,14 +1577,13 @@ DEPENDENCIES
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.1)
pg_query (~> 1.3.0)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.4.0)
puma (~> 5.1.1)
puma (~> 5.3.1)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3)
rack-attack (~> 6.3.0)
@ -1579,11 +1591,10 @@ DEPENDENCIES
rack-oauth2 (~> 1.16.0)
rack-proxy (~> 0.6.0)
rack-timeout (~> 0.5.1)
rails (~> 6.0.3.6)
rails (~> 6.1.3.2)
rails-controller-testing
rails-i18n (~> 6.0)
rainbow (~> 3.0)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
rbtrace (~> 0.4)
rdoc (~> 6.1.2)
@ -1615,7 +1626,7 @@ DEPENDENCIES
sassc-rails (~> 2.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142)
sentry-raven (~> 3.0)
sentry-raven (~> 3.1)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
sidekiq (~> 5.2.7)
@ -1625,7 +1636,7 @@ DEPENDENCIES
simplecov-cobertura (~> 1.3.1)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1)
solargraph (~> 0.40.4)
solargraph (~> 0.42)
spamcheck (~> 0.1.0)
spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4)
@ -1644,8 +1655,6 @@ DEPENDENCIES
truncato (~> 0.7.11)
u2f (~> 0.2.1)
unf (~> 0.1.4)
unicorn (~> 5.5)
unicorn-worker-killer (~> 0.4.4)
unleash (~> 0.1.5)
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)

View file

@ -21,15 +21,15 @@
version = "2.0.6";
};
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1543p34bfq7s4l83m0f84f0z5yr1ip1miyimv4gh2k136pgk23r9";
sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -37,21 +37,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dnx7mhhzwr45lsxkd7y9ld9vazcadxzs7813jp19hk3wra4jvs3";
sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cnsv97qx7708wg00lxcl7a6h8amxn85h40s8ngszhknh8wpwj3f";
sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -59,10 +59,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz";
sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -70,10 +70,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13i7x4zp991sq3zsagpzs01bhm81zgy63lamqrpsp68nv584n5sx";
sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -81,10 +81,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5";
sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -92,10 +92,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sy9kyl7famlwrdw7gz6sy7azhkcsn1mjja44s44libcz3fl7jpc";
sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
activemodel = {
dependencies = ["activesupport"];
@ -103,10 +103,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15kq8ghmkav331dz1pak1bc8q1v5xajw6pkj20hqr8m5zl6czcld";
sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a3hc2rammy4mfrjwzc9rsn497yq9xc0x89c00niiq45q3qs44vz";
sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
activerecord-explain-analyze = {
dependencies = ["activerecord" "pg"];
@ -131,15 +131,15 @@
version = "0.1.0";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "marcel"];
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jwdfqn01g7v7ssrrf2q2pvc8k6rdqccp26qkyfxiraaz9d1la62";
sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -147,10 +147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z";
sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@ -465,10 +465,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i";
type = "gem";
};
version = "1.1.2";
version = "1.2.0";
};
base32 = {
groups = ["default"];
@ -1509,15 +1509,15 @@
version = "6.1.0";
};
faraday = {
dependencies = ["multipart-post"];
groups = ["default" "development"];
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v";
type = "gem";
};
version = "1.0.1";
version = "1.4.2";
};
faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"];
@ -1530,6 +1530,36 @@
};
version = "0.0.7";
};
faraday-em_http = {
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
type = "gem";
};
version = "1.0.0";
};
faraday-excon = {
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-http-cache = {
dependencies = ["faraday"];
groups = ["default" "development"];
@ -1541,6 +1571,26 @@
};
version = "2.2.0";
};
faraday-net_http = {
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http_persistent = {
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka";
type = "gem";
};
version = "1.1.0";
};
faraday_middleware = {
dependencies = ["faraday"];
groups = ["default"];
@ -1605,14 +1655,14 @@
version = "2.10.0";
};
ffi = {
groups = ["default" "development" "kerberos" "puma" "test" "unicorn"];
groups = ["default" "development" "kerberos" "puma" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi";
type = "gem";
};
version = "1.13.1";
version = "1.15.1";
};
ffi-compiler = {
dependencies = ["ffi" "rake"];
@ -1641,10 +1691,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7";
sha256 = "00qjmmy4lx6cbyndpqgj330ys6pxi3chhqfaybd5c7m9y0kr6ck9";
type = "gem";
};
version = "0.17.1";
version = "0.21.0";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
@ -1652,10 +1702,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg";
sha256 = "06j6fg8qdxklml0qvindy8dghx3ilq2k3x5rwdxlr8vjl5hljqm5";
type = "gem";
};
version = "0.17.1";
version = "0.21.0";
};
flipper-active_support_cache_store = {
dependencies = ["activesupport" "flipper"];
@ -1663,10 +1713,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg";
sha256 = "00rb87d1f7wl1n3idv8bvjv45v3j1n1j5wm2vswisayv7z8wqp6r";
type = "gem";
};
version = "0.17.1";
version = "0.21.0";
};
flowdock = {
dependencies = ["httparty" "multi_json"];
@ -1891,10 +1941,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l0zq04lhqbzg0grca1c0p3a5gb9jdlhy41dhlgnrsaf7k6xads6";
sha256 = "1wpp1zdwjmglsycliag6v9844jnhpvkblry9i14a16gspqdsfam4";
type = "gem";
};
version = "13.12.0.pre.rc1";
version = "14.0.0.pre.rc2";
};
github-markup = {
groups = ["default"];
@ -1934,10 +1984,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h40p9v034jczialkh4brrv7karrx6a95mhrfpfs17p800lighzz";
sha256 = "09vcxzbsvgis47ifgd82rjn12587qcw6q2q0n0y3cg5snag6fqdb";
type = "gem";
};
version = "2.0.0";
version = "2.1.2";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store" "scientist"];
@ -1956,10 +2006,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05yc5fp45v7y6h838zrj4666ar1ddhn8i5bbdxm8j73yrn2kjnal";
sha256 = "1k5f3vyy2jqv3zdkdqal6sgn447zakz8xcc04432qd806s7g9i89";
type = "gem";
};
version = "1.0.1";
version = "1.1.1";
};
gitlab-fog-google = {
dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
@ -1973,15 +2023,15 @@
version = "1.13.0";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
sha256 = "1d18fx54dq2a2ngdix3dchbk4xpxfpqz1rkr2hi1kvi6idq4k6qp";
type = "gem";
};
version = "0.16.2";
version = "0.18.0";
};
gitlab-license = {
groups = ["default"];
@ -2034,6 +2084,17 @@
};
version = "0.4.0";
};
gitlab-pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17whjbrmyh1wn3badapa1xhdcjpdrxgn7vz705fpi1p9r8q0a2vj";
type = "gem";
};
version = "2.0.4";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
groups = ["default"];
@ -2127,10 +2188,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
sha256 = "00jm6b5gpzj99cngha3g70s0xnr0c58si7kx3g7jiaj9ipp26qj5";
type = "gem";
};
version = "3.14.0";
version = "3.17.1";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -2503,10 +2564,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj";
sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1";
type = "gem";
};
version = "1.2.1";
version = "1.2.3";
};
httparty = {
dependencies = ["mime-types" "multi_xml"];
@ -2740,15 +2801,16 @@
};
version = "1.2.1";
};
kgio = {
groups = ["default" "unicorn"];
kas-grpc = {
dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ai6bzlvxbzpdl466p1qi4dlhx8ri2wcrp6x1l19y3yfs3a29rng";
sha256 = "05lsvxb6mpx5h3zmp3pgs3cp52r1kb3a8yr9j7s3ksajb58zf7qi";
type = "gem";
};
version = "2.11.3";
version = "0.0.2";
};
knapsack = {
dependencies = ["rake"];
@ -2810,10 +2872,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17bv6zfdzwbbh8n0iw8zgjngsvyp2imrrfshj62yrlxpka9ka0z3";
sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h";
type = "gem";
};
version = "0.7.2";
version = "0.7.5";
};
letter_opener = {
dependencies = ["launchy"];
@ -3065,10 +3127,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
version = "1.1.0";
version = "1.0.2";
};
mini_portile2 = {
groups = ["default" "development" "test"];
@ -3810,16 +3872,6 @@
};
version = "1.2.3";
};
pg_query = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
type = "gem";
};
version = "1.3.0";
};
plist = {
groups = ["default"];
platforms = [];
@ -3947,10 +3999,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1315j8klxd404xxmcw1c6rlx7j445dzx62q5sggzvd59sl1amkf5";
sha256 = "1wyx2rz58lfys1h62h6inz7ggq8xckqyfxndk8jq2cbkkdi2n6d7";
type = "gem";
};
version = "0.4.0";
version = "0.4.1";
};
public_suffix = {
groups = ["default" "development" "test"];
@ -3968,10 +4020,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b";
sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
type = "gem";
};
version = "5.1.1";
version = "5.3.2";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
@ -4117,10 +4169,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01mwx4q9yz792dbi61j378iz6p7q63sxj3267jwwccjqmn6hf2kr";
sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -4172,10 +4224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i50vbscdk6wqxd2p0xwsyi07lwda612njqk8pn1f56snz5z0dcr";
sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2";
type = "gem";
};
version = "6.0.3.6";
version = "6.1.3.2";
};
rainbow = {
groups = ["default" "development" "test"];
@ -4187,16 +4239,6 @@
};
version = "3.0.0";
};
raindrops = {
groups = ["metrics" "unicorn"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zjja00mzgx2lddb7qrn14k7qrnwhf4bpmnlqj78m1pfxh7svync";
type = "gem";
};
version = "0.19.1";
};
rake = {
groups = ["default" "development" "test"];
platforms = [];
@ -4788,14 +4830,14 @@
version = "2.1.2";
};
ruby2_keywords = {
groups = ["default"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem";
};
version = "0.0.2";
version = "0.0.4";
};
ruby_parser = {
dependencies = ["sexp_processor"];
@ -4983,10 +5025,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h";
type = "gem";
};
version = "3.0.4";
version = "3.1.2";
};
settingslogic = {
groups = ["default"];
@ -5136,15 +5178,15 @@
version = "0.6.1";
};
solargraph = {
dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xrad7amwf3nmdbif566qprk6xvwydxwz0s7arnzpvr01anc9gcl";
sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi";
type = "gem";
};
version = "0.40.4";
version = "0.42.3";
};
spamcheck = {
dependencies = ["grpc"];
@ -5373,10 +5415,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mbhiz7g7nd3v1ai4cgwzp2zr34k1h5am0vn9bny5qqn1408rlgi";
sha256 = "1kgak2xqyp2wf7y1c1q1dpxw56iq9mgpqjji6vfbjkxckqrxhdmw";
type = "gem";
};
version = "0.1.3";
version = "0.1.4";
};
text = {
groups = ["default" "development"];
@ -5608,15 +5650,15 @@
version = "0.8.1";
};
tzinfo = {
dependencies = ["thread_safe"];
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
version = "1.2.9";
version = "2.0.4";
};
u2f = {
groups = ["default"];
@ -5679,28 +5721,6 @@
};
version = "1.4.0";
};
unicorn = {
dependencies = ["kgio" "raindrops"];
groups = ["unicorn"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cznkq0agsm7s66nbqbalmq5nlc5cdpd2h88r8jdzsc7wsi5a098";
type = "gem";
};
version = "5.5.5";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
groups = ["unicorn"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
type = "gem";
};
version = "0.4.4";
};
uniform_notifier = {
groups = ["default" "development" "test"];
platforms = [];

File diff suppressed because it is too large Load diff

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.5.10";
version = "1.5.20";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g";
sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd";
};
propagatedBuildInputs = [ jre ] ;

View file

@ -1,33 +1,37 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, fetchFromGitHub
, aiohttp
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "huisbaasje-client";
version = "0.1.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "6bc02384c37aba01719269b05882572050c80cd9abf98caa38519308e05b7db8";
src = fetchFromGitHub {
owner = "dennisschroer";
repo = "huisbaasje-client";
rev = "v${version}";
sha256 = "113aymffyz1nki3a43j5cyj87qa0762j38qlz0wd5px7diwjxsfl";
};
propagatedBuildInputs = [
aiohttp
];
# no tests on PyPI, no tags on GitHub
doCheck = false;
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "huisbaasje.huisbaasje" ];
meta = with lib; {
description = "Client for Huisbaasje";
homepage = "https://github.com/denniss17/huisbaasje-client";
homepage = "https://github.com/dennisschroer/huisbaasje-client";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};

View file

@ -0,0 +1,28 @@
{ lib, buildPythonPackage, fetchFromGitHub, nixosTests, six, twisted }:
buildPythonPackage rec {
pname = "txredisapi";
version = "1.4.7";
src = fetchFromGitHub {
owner = "IlyaSkriblovsky";
repo = "txredisapi";
rev = "1.4.7";
sha256 = "1f7j3c5l7jcfphvsk7nqmgyb4jaydbzq081m555kw0f9xxak0pgq";
};
propagatedBuildInputs = [ six twisted ];
doCheck = false;
pythonImportsCheck = [ "txredisapi" ];
passthru.tests.unit-tests = nixosTests.txredisapi;
meta = with lib; {
homepage = "https://github.com/IlyaSkriblovsky/txredisapi";
description = "non-blocking redis client for python";
license = licenses.asl20;
maintainers = with maintainers; [ dandellion ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hdparm";
version = "9.61";
version = "9.62";
src = fetchurl {
url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
sha256 = "sha256-2hocOIfxC4OX6OAgE8qmEULg5yyw1zmXQhyi8vTfU0M=";
sha256 = "sha256-LA+ddc2+2pKKJaEozT0LcSBEXsCRDAsp1MEDjtG+d38=";
};
preBuild = ''

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl
, bzip2, zlib, lz4, inotify-tools, pam, libcap
, bzip2, zlib, lz4, inotify-tools, pam, libcap, coreutils
, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
, nixosTests
# Auth modules
@ -27,9 +27,20 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = ''
postPatch = ''
sed -i -E \
-e 's!/bin/sh\b!${stdenv.shell}!g' \
-e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \
-e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \
src/lib-program-client/test-program-client-local.c
patchShebangs src/lib-smtp/test-bin/*.sh
sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
patchShebangs src/config/settings-get.pl
'' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system";
'' + lib.optionalString stdenv.isLinux ''
export systemdsystemunitdir=$out/etc/systemd/system
'';
# We need this for sysconfdir, see remark below.
installFlags = [ "DESTDIR=$(out)" ];
@ -81,6 +92,8 @@ stdenv.mkDerivation rec {
++ lib.optional withPgSQL "--with-pgsql"
++ lib.optional withSQLite "--with-sqlite";
doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "https://dovecot.org/";
description = "Open source IMAP and POP3 email server written with security primarily in mind";

View file

@ -60,7 +60,7 @@ buildPythonApplication rec {
typing-extensions
unpaddedbase64
] ++ lib.optional enableSystemd systemd
++ lib.optional enableRedis hiredis;
++ lib.optionals enableRedis [ hiredis txredisapi ];
checkInputs = [ mock parameterized openssl ];

View file

@ -1,86 +1,120 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand
, coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl
, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
, runtimeShell }:
with lib;
{ lib
, stdenv
, fetchFromGitHub
, writeShellScript
, autoreconfHook
, pkg-config
, runCommand
, coreutils
, gnugrep
, gnused
, lm_sensors
, net-snmp
, openssh
, openssl
, perl
, dnsutils
, libdbi
, libmysqlclient
, uriparser
, zlib
, openldap
, procps
, runtimeShell
}:
let
majorVersion = "2.2";
minorVersion = ".0";
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net-snmp procps ];
in stdenv.mkDerivation {
name = "monitoring-plugins-${majorVersion}${minorVersion}";
src = fetchFromGitHub {
owner = "monitoring-plugins";
repo = "monitoring-plugins";
rev = "v${majorVersion}";
sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1";
};
patches = [
# https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
(fetchpatch {
url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/ac0437ff896ba9ce2549b2d2ec3de146a886f08a.patch";
sha256 = "0jf6fqkyzag66rid92m7asnr2dp8rr8kn4zjvhqg0mqvf8imppky";
})
binPath = lib.makeBinPath [
(placeholder "out")
"/run/wrappers"
coreutils
gnugrep
gnused
lm_sensors
net-snmp
procps
];
# !!! Awful hack. Grrr... this of course only works on NixOS.
mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } ''
mkdir -p $out/bin
ln -s /run/wrappers/bin/sendmail $out/bin/mailq
'';
# For unknown reasons the installer tries executing $out/share and fails so
# we create it and remove it again later.
share = writeShellScript "share" ''
exit 0
'';
in
stdenv.mkDerivation rec {
pname = "monitoring-plugins";
version = "2.3.0";
src = fetchFromGitHub {
owner = "monitoring-plugins";
repo = "monitoring-plugins";
rev = "v" + lib.versions.majorMinor version;
sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg=";
};
# TODO: Awful hack. Grrr... this of course only works on NixOS.
# Anyway the check that configure performs to figure out the ping
# syntax is totally impure, because it runs an actual ping to
# localhost (which won't work for ping6 if IPv6 support isn't
# configured on the build machine).
preConfigure= ''
#
# --with-ping-command needs to be done here instead of in
# configureFlags due to the spaces in the argument
postPatch = ''
substituteInPlace po/Makefile.in.in \
--replace /bin/sh ${stdenv.shell}
--replace /bin/sh ${runtimeShell}
sed -i configure.ac \
-e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"\$out/bin:/run/wrappers/bin:${binPath}\"|'
-e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|'
configureFlagsArray=(
configureFlagsArray+=(
--with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
--with-sudo-command='/run/wrappers/bin/sudo'
--with-mailq-command='${runCommand "mailq-wrapper" {preferLocalBuild=true;} ''
mkdir -p $out/bin
ln -s /run/wrappers/bin/sendmail $out/bin/mailq
''}/bin/mailq'
)
install -Dm555 ${share} $out/share
'';
# !!! make openssh a runtime dependency only
buildInputs = [ dnsutils libdbi libmysqlclient net-snmp openldap openssh openssl perl procps zlib ];
configureFlags = [
"--libexecdir=${placeholder "out"}/bin"
"--with-mailq-command=${mailq}/bin/mailq"
"--with-sudo-command=/run/wrappers/bin/sudo"
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
dnsutils
libdbi
libmysqlclient
net-snmp
openldap
# TODO: make openssh a runtime dependency only
openssh
openssl
perl
procps
uriparser
zlib
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
enableParallelBuilding = true;
# For unknown reasons the installer tries executing $out/share and fails if
# it doesn't succeed.
# So we create it and remove it again later.
preBuild = ''
mkdir -p $out
cat <<_EOF > $out/share
#!${runtimeShell}
exit 0
_EOF
chmod 755 $out/share
'';
postInstall = ''
rm $out/share
ln -s libexec $out/bin
'';
meta = {
meta = with lib; {
description = "Official monitoring plugins for Nagios/Icinga/Sensu and others";
homepage = "https://www.monitoring-plugins.org";
license = licenses.gpl2;
platforms = platforms.linux;
homepage = "https://www.monitoring-plugins.org";
license = licenses.gpl3Only;
maintainers = with maintainers; [ thoughtpolice relrod ];
platforms = platforms.linux;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
version = "1.8.7";
version = "1.8.8";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "0mw0sizy30slgyd06syd9sqx22dxd08ncqx7srcinj1g7hxylm5z";
sha256 = "00pd4hm8gj200xagc33a73kdbwykwj4nhi596lybji0k231wylz5";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, writeText }:
{ lib, stdenv, fetchurl, writeText }:
stdenv.mkDerivation rec {
pname = "mediawiki";
version = "1.35.2";
version = "1.36.1";
src = with lib; fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "07cch4j2lcncfjv71351c1fxh200p83g2ijb3c9x8rv6nzcmiymz";
sha256 = "0ymda3x58a7ic4bwhbkxc7rskkwn164nplxzq9g4w9qnmwcqnsg6";
};
prePatch = ''

View file

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "cm-rgb";
version = "0.3.4";
version = "0.3.6";
src = fetchFromGitHub {
owner = "gfduszynski";
repo = pname;
rev = "v${version}";
sha256 = "04brldaa2zpvzkcg43i5hpbj03d1nqrgiplm5nh4shn12cif19ag";
sha256 = "sha256-m0ZAjSLRzcjzygLEbvCiDd7krc1gRqTg1ZV4H/o2c68=";
};
nativeBuildInputs = [
@ -37,10 +37,6 @@ buildPythonApplication rec {
];
postInstall = ''
# Remove this line when/if this PR gets merged:
# https://github.com/gfduszynski/cm-rgb/pull/43
install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui
mkdir -p $out/etc/udev/rules.d
echo 'SUBSYSTEM=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0051", TAG+="uaccess"' \
> $out/etc/udev/rules.d/60-cm-rgb.rules
@ -51,7 +47,7 @@ buildPythonApplication rec {
longDescription = ''
cm-rgb controls AMD Wraith Prism RGB LEDS.
To permit non-root accounts to change use this utility on
To permit non-root accounts to use this utility on
NixOS, add this package to <literal>services.udev.packages</literal>
in <filename>configuration.nix</filename>.
'';

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
version = "3.26";
version = "3.27";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ=";
sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw=";
};
buildInputs = [ python3 zlib ]

View file

@ -1,26 +1,43 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform
, darwin, fontconfig, harfbuzz, openssl, pkg-config }:
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, darwin
, fontconfig
, harfbuzz
, openssl
, pkg-config
, makeWrapper
, biber
}:
rustPlatform.buildRustPackage rec {
pname = "tectonic";
version = "0.6.4";
version = "0.7.0";
src = fetchFromGitHub {
owner = "tectonic-typesetting";
repo = "tectonic";
rev = "tectonic@${version}";
fetchSubmodules = true;
sha256 = "11q0vwgjlailkw4l9z7r54wkxi8dwh40pm7bd74dcvm0x4323fpd";
sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI=";
};
cargoSha256 = "1drfgrsfz44yqz15bcmb3dyyz7dr9zbs3idl1ssaiir24d4z1m9z";
cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y=";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ fontconfig harfbuzz openssl ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
postInstall = lib.optionalString stdenv.isLinux ''
# Tectonic runs biber when it detects it needs to run it, see:
# https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0
postInstall = ''
wrapProgram $out/bin/tectonic \
--prefix PATH "${lib.getBin biber}/bin"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace dist/appimage/tectonic.desktop \
--replace Exec=tectonic Exec=$out/bin/tectonic
install -D dist/appimage/tectonic.desktop -t $out/share/applications/
install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
'';

View file

@ -8711,6 +8711,8 @@ in {
txgithub = callPackage ../development/python-modules/txgithub { };
txredisapi = callPackage ../development/python-modules/txredisapi { };
txrequests = callPackage ../development/python-modules/txrequests { };
txtorcon = callPackage ../development/python-modules/txtorcon { };