pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #230893 from yayayayaka/gitlab-ruby_3_0

gitlab: Build with ruby_3_0

authored by

Martin Weinelt and committed by
GitHub 912f73ad b25597c8

+2 -3
unified split
+2 -3
pkgs/applications/version-management/gitlab/default.nix
··· 1 { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv 2 - , ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl 3 , gitlabEnterprise ? false, callPackage, yarn 4 , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config 5 }: ··· 17 18 rubyEnv = bundlerEnv rec { 19 name = "gitlab-env-${version}"; 20 - # GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149 21 - ruby = ruby_2_7; 22 gemdir = ./rubyEnv; 23 gemset = 24 let x = import (gemdir + "/gemset.nix") src;
··· 1 { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv 2 + , ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl 3 , gitlabEnterprise ? false, callPackage, yarn 4 , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config 5 }: ··· 17 18 rubyEnv = bundlerEnv rec { 19 name = "gitlab-env-${version}"; 20 + ruby = ruby_3_0; 21 gemdir = ./rubyEnv; 22 gemset = 23 let x = import (gemdir + "/gemset.nix") src;