diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-05-10 21:22:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 21:22:00 +0200 |
| commit | 912f73adf53250a2e2dfab56d15557b9b0ff530e (patch) | |
| tree | bb5b4672d37b62ee2538c1c33f8596b81035907b | |
| parent | b25597c89cf28093af8880faf11d0871d0c3cb13 (diff) | |
| parent | bf964430f065860ede420d178bce11df727b6b79 (diff) | |
Merge pull request #230893 from yayayayaka/gitlab-ruby_3_0
gitlab: Build with ruby_3_0
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 8e20cc8a79443..105c2ce3e476e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -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; |