Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d7e569657406
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b64205d164ac
Choose a head ref
  • 15 commits
  • 23 files changed
  • 6 contributors

Commits on May 18, 2020

  1. gitlab: 12.8.10 -> 12.10.6

    Milan Pässler committed May 18, 2020
    Copy the full SHA
    f613702 View commit details
  2. gitlab: increase webpack memory limit

    Milan Pässler committed May 18, 2020
    Copy the full SHA
    7555548 View commit details
  3. nixos/gitlab: use new structure.sql

    Milan Pässler committed May 18, 2020
    Copy the full SHA
    47c8e52 View commit details
  4. gitaly: revert a commit that broke config loading

    Milan Pässler committed May 18, 2020
    Copy the full SHA
    e32bf64 View commit details

Commits on May 30, 2020

  1. act: 0.2.8 -> 0.2.9

    marsam committed May 30, 2020
    Copy the full SHA
    f943f00 View commit details
  2. cocoapods: 1.9.2 -> 1.9.3

    lilyball committed May 30, 2020
    Copy the full SHA
    8cc640b View commit details
  3. Copy the full SHA
    9a11cd6 View commit details
  4. jc: 1.10.12 -> 1.11.1

    Atemu committed May 30, 2020
    Copy the full SHA
    45ac259 View commit details

Commits on May 31, 2020

  1. Copy the full SHA
    7060927 View commit details
  2. gitlab: 12.10.6 -> 12.10.8

    globin committed May 31, 2020
    Copy the full SHA
    af05325 View commit details
  3. Merge pull request #89228 from marsam/update-act

    act: 0.2.8 -> 0.2.9
    marsam authored May 31, 2020
    Copy the full SHA
    e94d97d View commit details
  4. Merge pull request #89231 from Atemu/jc-update

    jc: 1.10.12 -> 1.11.1
    marsam authored May 31, 2020
    Copy the full SHA
    9c706a2 View commit details
  5. Merge pull request #89230 from lilyball/cocoapods

    cocoapods: 1.9.2 -> 1.9.3
    marsam authored May 31, 2020
    Copy the full SHA
    6cd1edc View commit details
  6. vamp-plugin-sdk: 2.9 -> 2.10

    r-ryantm authored and veprbl committed May 31, 2020
    Copy the full SHA
    b3206bb View commit details
  7. Merge pull request #85293 from petabyteboy/feature/gitlab-12-9-x

    gitlab: 12.8.10 -> 12.10.6
    globin authored May 31, 2020
    Copy the full SHA
    b64205d View commit details
Showing with 1,428 additions and 987 deletions.
  1. +1 −1 nixos/modules/services/misc/gitlab.nix
  2. +7 −7 pkgs/applications/version-management/gitlab/data.json
  3. +1 −1 pkgs/applications/version-management/gitlab/default.nix
  4. +3 −3 pkgs/applications/version-management/gitlab/gitaly/Gemfile
  5. +12 −20 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
  6. +7 −5 pkgs/applications/version-management/gitlab/gitaly/default.nix
  7. +221 −41 pkgs/applications/version-management/gitlab/gitaly/deps.nix
  8. +13 −39 pkgs/applications/version-management/gitlab/gitaly/gemset.nix
  9. +2 −2 pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  10. +2 −2 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  11. +223 −34 pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
  12. +20 −17 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
  13. +69 −64 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  14. +113 −82 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  15. +3 −3 pkgs/applications/version-management/gitlab/update.py
  16. +708 −644 pkgs/applications/version-management/gitlab/yarnPkgs.nix
  17. +2 −2 pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
  18. +3 −3 pkgs/development/mobile/cocoapods/Gemfile-beta.lock
  19. +3 −3 pkgs/development/mobile/cocoapods/Gemfile.lock
  20. +4 −4 pkgs/development/mobile/cocoapods/gemset-beta.nix
  21. +4 −4 pkgs/development/mobile/cocoapods/gemset.nix
  22. +2 −2 pkgs/development/python-modules/jc/default.nix
  23. +5 −4 pkgs/development/tools/misc/act/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ let
HOME = "${cfg.statePath}/home";
UNICORN_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
SCHEMA = "${cfg.statePath}/db/schema.rb";
SCHEMA = "${cfg.statePath}/db/structure.sql";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
14 changes: 7 additions & 7 deletions pkgs/applications/version-management/gitlab/data.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "12.8.10",
"repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15",
"version": "12.10.8",
"repo_hash": "189l6l47s5lz0y2qjbai1n9l6yq513d38apyv88c3by3r41m86y1",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.10-ee",
"rev": "v12.10.8-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.10",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.2"
"GITALY_SERVER_VERSION": "12.10.8",
"GITLAB_PAGES_VERSION": "1.17.0",
"GITLAB_SHELL_VERSION": "12.2.0",
"GITLAB_WORKHORSE_VERSION": "8.30.2"
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/default.nix
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ let
bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=2048"
bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=3072"
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
runHook postBuild
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
gem 'activesupport', '6.0.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
gem 'grpc', '~> 1.24.0'
gem 'grpc', '~> 1.27.0'
gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
@@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.9.1'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 8.9.0'

gem 'google-protobuf', '~> 3.8.0'
gem 'google-protobuf', '~> 3.11.2'

group :development, :test do
gem 'rubocop', '~> 0.69', require: false
32 changes: 12 additions & 20 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -56,22 +56,17 @@ GEM
mini_mime (~> 1.0)
rugged (>= 0.25.1)
github-markup (1.7.0)
gitlab-gollum-lib (4.2.7.7)
gitlab-gollum-lib (4.2.7.8)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-labkit (0.9.1)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
@@ -80,13 +75,11 @@ GEM
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
google-protobuf (3.8.0)
google-protobuf (3.11.4)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
grpc (1.24.0)
google-protobuf (~> 3.8)
grpc (1.27.0)
google-protobuf (~> 3.11)
googleapis-common-protos-types (~> 1.0)
hashdiff (0.3.9)
i18n (1.8.2)
@@ -121,9 +114,8 @@ GEM
opentracing (0.5.0)
optimist (3.0.0)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.7.0.5)
ast (~> 2.4.0)
posix-spawn (0.3.13)
proc_to_ast (0.1.0)
coderay
parser
@@ -148,7 +140,7 @@ GEM
optimist (>= 3.0.0)
rdoc (6.2.0)
redis (4.1.3)
rouge (3.15.0)
rouge (3.18.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -196,13 +188,13 @@ GEM
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unparser (0.4.5)
unparser (0.4.7)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
parser (~> 2.6.3)
parser (>= 2.6.5)
procto (~> 0.0.2)
vcr (4.0.0)
webmock (3.4.2)
@@ -220,12 +212,12 @@ DEPENDENCIES
factory_bot
faraday (~> 0.12)
github-linguist (~> 7.5)
gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-lib (~> 4.2.7.8)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.9.1)
gitlab-markup (~> 1.7.0)
google-protobuf (~> 3.8.0)
grpc (~> 1.24.0)
google-protobuf (~> 3.11.2)
grpc (~> 1.27.0)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
12 changes: 7 additions & 5 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
Original file line number Diff line number Diff line change
@@ -19,19 +19,21 @@ let
};
};
in buildGoPackage rec {
version = "12.8.10";
version = "12.10.8";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs";
sha256 = "02dih35j97q80kzi46pkf9f9r1sffw11i5zmpjs2rr96al426g8q";
};

# Fix a check which assumes that hook files are writeable by their
# owner.
patches = [ ./fix-executable-check.patch ];
patches = [
./fix-executable-check.patch
];

goPackagePath = "gitlab.com/gitlab-org/gitaly";

@@ -52,8 +54,8 @@ in buildGoPackage rec {
# code by default which doesn't work in nixos because it's a
# read-only filesystem
substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
"File.join(ROOT_PATH, 'config.yml')" \
"'/run/gitlab/shell-config.yml'"
"ROOT_PATH.join('config.yml')" \
"Pathname.new('/run/gitlab/shell-config.yml')"
'';

outputs = [ "out" "ruby" ];
262 changes: 221 additions & 41 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix

Large diffs are not rendered by default.

52 changes: 13 additions & 39 deletions pkgs/applications/version-management/gitlab/gitaly/gemset.nix
Original file line number Diff line number Diff line change
@@ -247,15 +247,15 @@
version = "1.7.0";
};
gitlab-gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
dependencies = ["gemojione" "github-markup" "gitlab-gollum-rugged_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf";
sha256 = "0dwrggw38wkadm9i1q8bj15lf0ik5z6qlbbggkgcvmbxb0a4hrmx";
type = "gem";
};
version = "4.2.7.7";
version = "4.2.7.8";
};
gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
@@ -268,15 +268,6 @@
};
version = "0.4.4.2";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
type = "gem";
};
version = "2.8.2";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"];
@@ -298,24 +289,15 @@
};
version = "1.7.0";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
type = "gem";
};
version = "1.0.1";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
sha256 = "1swxvka4qcfa986qr5d3hxqlcsraxfb6fsc0mf2ngxmq15wad8br";
type = "gem";
};
version = "3.8.0";
version = "3.11.4";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -334,10 +316,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
sha256 = "0jbfnsdvb9hbqgkh2qkckzxvdwcbhdkwwvlnc5mb8679hxz7b7bs";
type = "gem";
};
version = "1.24.0";
version = "1.27.0";
};
hashdiff = {
groups = ["default" "development" "test"];
@@ -563,18 +545,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
type = "gem";
};
version = "2.6.3.0";
};
posix-spawn = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
type = "gem";
};
version = "0.3.13";
version = "2.7.0.5";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@@ -695,10 +669,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx";
sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq";
type = "gem";
};
version = "3.15.0";
version = "3.18.0";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -908,10 +882,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c";
sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx";
type = "gem";
};
version = "0.4.5";
version = "0.4.7";
};
vcr = {
source = {
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

buildGoPackage rec {
pname = "gitlab-shell";
version = "11.0.0";
version = "12.2.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1ca4yil8gp1cm7w939irp1x2y907z2mkdqiap8ik8mqp8svv1m44";
sha256 = "0zjpjk7iv083ys11sn3hiqawp09zgi9hhhv4hdh13axaw9ld340v";
};

buildInputs = [ ruby ];
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";

version = "8.21.2";
version = "8.30.2";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w";
sha256 = "1ws59ry16kx4nqp92xcqw3fri570pvpdgvy822ndi7rybw5xij7p";
};

goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
257 changes: 223 additions & 34 deletions pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rails', '6.0.2'

gem 'bootsnap', '~> 1.4'
gem 'bootsnap', '~> 1.4.6'

# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -58,7 +58,7 @@ gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 0.12.1'

# Two-factor authentication
gem 'devise-two-factor', '~> 3.0.0'
gem 'devise-two-factor', '~> 3.1.0'
gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 3.1.0'
gem 'u2f', '~> 0.2.1'
@@ -87,7 +87,7 @@ gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'

# GraphQL API
gem 'graphql', '~> 1.9.12'
gem 'graphql', '~> 1.10.5'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747
@@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.10'
gem 'rouge', '~> 3.15.0'
gem 'rouge', '~> 3.18.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.5'
@@ -159,7 +159,7 @@ gem 'escape_utils', '~> 1.1'
gem 'icalendar'

# Diffs
gem 'diffy', '~> 3.1.0'
gem 'diffy', '~> 3.3'
gem 'diff_match_patch', '~> 0.1.0'

# Application server
@@ -171,7 +171,7 @@ group :unicorn do
end

group :puma do
gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false
gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
gem 'rack-timeout', require: false
end
@@ -237,7 +237,7 @@ gem 'atlassian-jwt', '~> 0.2.0'
gem 'flowdock', '~> 0.7'

# Slack integration
gem 'slack-notifier', '~> 1.5.1'
gem 'slack-messenger', '~> 2.3.3'

# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -301,7 +301,7 @@ gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.10.3'

# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.9.1'
gem 'gitlab-labkit', '0.12.0'

# I18n
gem 'ruby_parser', '~> 3.8', require: false
@@ -355,7 +355,7 @@ group :development, :test do

gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0'
gem 'rspec-rails', '~> 4.0.0.beta3'
gem 'rspec-rails', '~> 4.0.0.beta4'

# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
@@ -366,24 +366,24 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'

gem 'gitlab-styles', '~> 3.1.0', require: false
gem 'gitlab-styles', '~> 3.2.0', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.74.0'
gem 'rubocop-performance', '~> 1.4.1'
gem 'rubocop-rspec', '~> 1.37.0'

gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
gem 'simplecov', '~> 0.18.5', require: false
gem 'bundler-audit', '~> 0.6.1', require: false

gem 'benchmark-ips', '~> 2.3.0', require: false

gem 'knapsack', '~> 1.17'

gem 'simple_po_parser', '~> 1.1.2', require: false

gem 'timecop', '~> 0.8.0'
gem 'timecop', '~> 0.9.1'

gem 'png_quantizator', '~> 0.2.1', require: false

@@ -399,7 +399,6 @@ group :test do
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false

gem 'capybara', '~> 3.22.0'
@@ -419,12 +418,13 @@ end

gem 'octokit', '~> 4.15'

gem 'mail_room', '~> 0.10.0'
# https://gitlab.com/gitlab-org/gitlab/issues/207207
gem 'gitlab-mail_room', '~> 0.0.3', require: 'mail_room'

gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'

gem 'ruby-prof', '~> 1.0.0'
gem 'ruby-prof', '~> 1.3.0'
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -455,7 +455,7 @@ group :ed25519 do
end

# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 1.86.0'
gem 'gitaly', '~> 12.9.0.pre.rc4'

gem 'grpc', '~> 1.24.0'

@@ -492,3 +492,6 @@ gem 'erubi', '~> 1.9.0'
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
# See https://gitlab.com/gitlab-org/gitlab/issues/197386
gem 'mail', '= 2.7.1'

# File encryption
gem 'lockbox', '~> 0.3.3'
133 changes: 69 additions & 64 deletions pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock

Large diffs are not rendered by default.

195 changes: 113 additions & 82 deletions pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/update.py
Original file line number Diff line number Diff line change
@@ -177,7 +177,7 @@ def update_gitaly():
subprocess.check_output(['bundix'], cwd=gitaly_dir)

os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir)

for fn in ['go.mod', 'go.sum']:
os.unlink(gitaly_dir / fn)
@@ -200,7 +200,7 @@ def update_gitlab_shell():
f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))

os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir)

for fn in ['go.mod', 'go.sum']:
os.unlink(gitlab_shell_dir / fn)
@@ -221,7 +221,7 @@ def update_gitlab_workhorse():
f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))

os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir)

for fn in ['go.mod', 'go.sum']:
os.unlink(gitlab_workhorse_dir / fn)
1,352 changes: 708 additions & 644 deletions pkgs/applications/version-management/gitlab/yarnPkgs.nix

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "vamp-plugin-sdk";
version = "2.9";
version = "2.10";

src = fetchFromGitHub {
owner = "c4dm";
repo = "vamp-plugin-sdk";
rev = "vamp-plugin-sdk-v${version}";
sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1";
sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6";
};

nativeBuildInputs = [ pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.2)
cocoapods (1.9.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.2)
cocoapods-core (= 1.9.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.2)
cocoapods-core (1.9.3)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
6 changes: 3 additions & 3 deletions pkgs/development/mobile/cocoapods/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.2)
cocoapods (1.9.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.2)
cocoapods-core (= 1.9.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.2)
cocoapods-core (1.9.3)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
Original file line number Diff line number Diff line change
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36";
sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60";
type = "gem";
};
version = "1.9.2";
version = "1.9.3";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p";
sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13";
type = "gem";
};
version = "1.9.2";
version = "1.9.3";
};
cocoapods-deintegrate = {
groups = ["default"];
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/gemset.nix
Original file line number Diff line number Diff line change
@@ -55,21 +55,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36";
sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60";
type = "gem";
};
version = "1.9.2";
version = "1.9.3";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p";
sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13";
type = "gem";
};
version = "1.9.2";
version = "1.9.3";
};
cocoapods-deintegrate = {
groups = ["default"];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jc/default.nix
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@

buildPythonPackage rec {
pname = "jc";
version = "1.10.12";
version = "1.11.1";
disabled = isPy27;

src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
sha256 = "04gggx47acckyd96cginrw7ldw7fqgkiggk9fxdij2hwi03mk4n4";
sha256 = "0qackvhs35npgnga5riclnwqdwasc0kba48pwnrfxf0hm2i0kbgp";
};

propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
9 changes: 5 additions & 4 deletions pkgs/development/tools/misc/act/default.nix
Original file line number Diff line number Diff line change
@@ -2,23 +2,24 @@

buildGoModule rec {
pname = "act";
version = "0.2.8";
version = "0.2.9";

src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x";
sha256 = "17w7pqpn9pkzc85lrsmyhxy6rip47dxw1hkz4ml3y5n68nysfpb9";
};

vendorSha256 = "0ns20vvrj0j921wsx227dxbpga6kll7pxglfqhl53xckrh85yyd8";
vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

meta = with lib; {
description = "Run your GitHub Actions locally";
homepage = "https://github.com/nektos/act";
changelog = "https://github.com/nektos/act/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
};
}
}