From bf964430f065860ede420d178bce11df727b6b79 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 9 May 2023 15:02:26 +0000 Subject: [PATCH] gitlab: Build with ruby_3_0 Ruby 2.7 is EOL since 2023-03-31. Support for Ruby 3.0 has been added by gitlab in the meantime. --- pkgs/applications/version-management/gitlab/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 8e20cc8a7944..105c2ce3e476 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;