From 1a205ad7fb0c9cfdf49c165787482eac88057cba Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 5 Jul 2019 00:20:00 +0200 Subject: [PATCH] gitlab-ce: remove substituteInPlace This was removed in https://gitlab.com/gitlab-org/gitlab-ce/commit/23bcbf04c875ac31e6a04453931d5173c56d5efa (since v11.6.0) --- pkgs/applications/version-management/gitlab/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 584006db1007..6ac1a9d68616 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, procps, nettools, nixosTests +, ruby, tzdata, git, nettools, nixosTests , gitlabEnterprise ? false }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = sources.gitlab; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools ]; patches = [ ./remove-hardcoded-locations.patch ]; @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb - substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" - sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb '';