From c39f7d7086d92ef7aba3375932000d289086adbe Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 13 May 2026 13:48:42 +0200 Subject: [PATCH] gitlab: replace `replace` with `sed` `replace` was marked as nonfree in #516986 and the NixOS tests no longer evaluate without `NIXPKGS_ALLOW_UNFREE=1` as a result. --- pkgs/by-name/gi/gitlab/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix index 8f7efd2ab854..fc20ffb3e2cb 100644 --- a/pkgs/by-name/gi/gitlab/package.nix +++ b/pkgs/by-name/gi/gitlab/package.nix @@ -12,7 +12,6 @@ net-tools, nixosTests, nodejs_22, - replace, ruby_3_3, stdenv, tzdata, @@ -395,10 +394,10 @@ stdenv.mkDerivation { # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the # state directory. - ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config - ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config - ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config - ${replace}/bin/replace-literal -f -r -e 'require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"' "require_relative '$out/share/gitlab/lib/gitlab/puma/error_handler'" config + find config -type f -exec sed -i -e "s|\.\./\.\./lib|$out/share/gitlab/lib|" {} + + find config -type f -exec sed -i -e "s|\.\./lib|$out/share/gitlab/lib|" {} + + find config -type f -exec sed -i -e "s|require_relative 'application'|require_relative '$out/share/gitlab/config/application'|" {} + + find config -type f -exec sed -i -e "s|require_relative \"/home/git/gitlab/lib/gitlab/puma/error_handler\"|require_relative \"$out/share/gitlab/lib/gitlab/puma/error_handler\"|" {} + ''; buildPhase = ''