From 5db0fdeecca2d0930b0d446e37611e5dd71fd5d8 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 22 Nov 2023 15:47:31 +0100 Subject: gitlab: downgrade Ruby from 3.2 to 3.1 (#268764) Ruby 3.0 was dropped from nixpkgs in #264361 as it will soon become EOL during the NixOS 23.11 release. As a result, the Ruby version in gitlab was (accidentally) updated to 3.2. However, gitlab does not officially support Ruby 3.2 yet. [gitlab-org&9684] Official support for Ruby 3.1 will be introduced in the December 2023 release of gitlab. [gitlab-org&10034] Packaging gitlab with Ruby 3.1 in nixpkgs had been confimed working by a maintainer. As such, it should be safe to downgrade the Ruby version to 3.1. [gitlab-org&9684]: https://gitlab.com/groups/gitlab-org/-/epics/9684 [gitlab-org&10034]: https://gitlab.com/groups/gitlab-org/-/epics/10034 --- pkgs/applications/version-management/gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c3e715ad46fe..e73512ddce42 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_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl +, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: @@ -17,7 +17,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_2; + ruby = ruby_3_1; gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix") src; -- cgit 1.4.1