Merge pull request #136564 from yu-re-ka/feature/gitlab-14-2-3
gitlab: 14.2.1 -> 14.2.3launchpad/nixpkgs/master
commit
c8839f6633
@ -1,13 +1,13 @@ |
||||
{ |
||||
"version": "14.2.1", |
||||
"repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z", |
||||
"version": "14.2.3", |
||||
"repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p", |
||||
"owner": "gitlab-org", |
||||
"repo": "gitlab", |
||||
"rev": "v14.2.1-ee", |
||||
"rev": "v14.2.3-ee", |
||||
"passthru": { |
||||
"GITALY_SERVER_VERSION": "14.2.1", |
||||
"GITALY_SERVER_VERSION": "14.2.3", |
||||
"GITLAB_PAGES_VERSION": "1.42.0", |
||||
"GITLAB_SHELL_VERSION": "13.19.1", |
||||
"GITLAB_WORKHORSE_VERSION": "14.2.1" |
||||
"GITLAB_WORKHORSE_VERSION": "14.2.3" |
||||
} |
||||
} |
||||
|
@ -0,0 +1,10 @@ |
||||
--- a/src/ruby/ext/grpc/extconf.rb
|
||||
+++ b/src/ruby/ext/grpc/extconf.rb
|
||||
@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
|
||||
if ENV['AR'].nil? || ENV['AR'].size == 0
|
||||
ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
|
||||
end
|
||||
+ENV['AR'] = ENV['AR'] + ' rcs'
|
||||
if ENV['CC'].nil? || ENV['CC'].size == 0
|
||||
ENV['CC'] = RbConfig::CONFIG['CC']
|
||||
end
|
Loading…
Reference in new issue