Merge pull request #28765 from afrepues/gitlab-8.17.8-and-fix-build-phase

Gitlab 8.17.8 and fix build phase
This commit is contained in:
Jörg Thalheim 2017-08-31 17:35:37 +01:00 committed by GitHub
commit 73d8582844

View File

@ -18,11 +18,11 @@ let
}; };
}; };
version = "8.17.6"; version = "8.17.8";
gitlabDeb = fetchurl { gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3"; sha256 = "0r4f1illaalhrvc6zgq19g4jcs77jf665l8bgx6pyvw45yn6wv7h";
}; };
in in
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq"; owner = "gitlabhq";
repo = "gitlabhq"; repo = "gitlabhq";
rev = "v${version}"; rev = "v${version}";
sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr"; sha256 = "041ld3na8m42akqpljipid984d0mv0wzk2p1630fncc1w3iaq06d";
}; };
patches = [ patches = [
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
mv config/gitlab.yml.example config/gitlab.yml mv config/gitlab.yml.example config/gitlab.yml
dpkg -x ${gitlabDeb} . dpkg --fsys-tarfile ${gitlabDeb} | tar -x --no-same-permissions --no-same-owner
mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
rm -rf opt rm -rf opt