From cffb1fab3e300dfab1b952c79ecd32eb5e79af34 Mon Sep 17 00:00:00 2001 From: Servilio Afre Puentes Date: Mon, 28 Aug 2017 14:56:50 -0400 Subject: [PATCH 1/2] gitlab: 8.17.6 -> 8.17.8 Latest release has important bugfixes. --- pkgs/applications/version-management/gitlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 9929c94198d..c139a3ff45d 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 = [ From fae458c5e73b51b4758be7dc6f1a6bf6ac8476fc Mon Sep 17 00:00:00 2001 From: Servilio Afre Puentes Date: Mon, 28 Aug 2017 14:39:04 -0400 Subject: [PATCH 2/2] gitlab: fix permission issue in build phase The newer DEB packages have a setuid file, creating an error when unpacking the source during the build phase. As dpkg doesn't have a way to pass parameters to tar, dpkg is then told to just extract the filesystem tar file and that is unpacked by tar directly. Fixes #28494 --- pkgs/applications/version-management/gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c139a3ff45d..815bc30344a 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -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