dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gitlab-ce: remove substituteInPlace

Browse Source 
This was removed in
23bcbf04c8
(since v11.6.0)
This commit is contained in:
Florian Klink 2019-07-05 00:20:00 +02:00
parent 80c35fb2a5
commit 1a205ad7fb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/version-management/gitlab/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, procps, nettools, nixosTests , ruby, tzdata, git, nettools, nixosTests
, gitlabEnterprise ? false , gitlabEnterprise ? false
}: }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
src = sources.gitlab; src = sources.gitlab;
buildInputs = [ buildInputs = [
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
]; ];
patches = [ ./remove-hardcoded-locations.patch ]; patches = [ ./remove-hardcoded-locations.patch ];
@ -49,9 +49,6 @@ stdenv.mkDerivation rec {
rm config/initializers/gitlab_shell_secret_token.rb 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 -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 sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
''; '';