Merge pull request #230893 from yayayayaka/gitlab-ruby_3_0
gitlab: Build with ruby_3_0
This commit is contained in:
commit
912f73adf5
1 changed files with 2 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
|
||||
, ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl
|
||||
, ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl
|
||||
, gitlabEnterprise ? false, callPackage, yarn
|
||||
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config
|
||||
}:
|
||||
|
@ -17,8 +17,7 @@ let
|
|||
|
||||
rubyEnv = bundlerEnv rec {
|
||||
name = "gitlab-env-${version}";
|
||||
# GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149
|
||||
ruby = ruby_2_7;
|
||||
ruby = ruby_3_0;
|
||||
gemdir = ./rubyEnv;
|
||||
gemset =
|
||||
let x = import (gemdir + "/gemset.nix") src;
|
||||
|
|
Loading…
Reference in a new issue