diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-31 17:35:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 17:35:37 +0100 |
| commit | 73d85828445288abb0b1a2512ab637d4b4e3027a (patch) | |
| tree | 5961fccf58889dcadba03c7a13c5d3d747d31cc3 /pkgs/applications | |
| parent | 0b2f9d1ce12d49439472045df8da3acadacc6fea (diff) | |
| parent | fae458c5e73b51b4758be7dc6f1a6bf6ac8476fc (diff) | |
| download | nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar.gz nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar.bz2 nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar.lz nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar.xz nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.tar.zst nixpkgs-73d85828445288abb0b1a2512ab637d4b4e3027a.zip | |
Merge pull request #28765 from afrepues/gitlab-8.17.8-and-fix-build-phase
Gitlab 8.17.8 and fix build phase
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 9929c94198d..815bc30344a 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "8.17.6"; + version = "8.17.8"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3"; + sha256 = "0r4f1illaalhrvc6zgq19g4jcs77jf665l8bgx6pyvw45yn6wv7h"; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr"; + sha256 = "041ld3na8m42akqpljipid984d0mv0wzk2p1630fncc1w3iaq06d"; }; patches = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { buildPhase = '' 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 rm -rf opt |