diff options
| author | Robin Gloster <mail@glob.in> | 2018-03-22 02:08:49 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-03-22 02:29:28 +0100 |
| commit | 08946efdc80b3c1670d3093b06d60fab7b73011a (patch) | |
| tree | 5a3d0645f66faed410459c527d829a8e9071b92c /pkgs/applications/version-management/gitlab/default.nix | |
| parent | 1b559058064992e5d8cd951f42232793aa99d960 (diff) | |
| download | nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar.gz nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar.bz2 nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar.lz nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar.xz nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.tar.zst nixlib-08946efdc80b3c1670d3093b06d60fab7b73011a.zip | |
gitlab: 10.5.4 -> 10.5.6
Diffstat (limited to 'pkgs/applications/version-management/gitlab/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 0d736188f084..1c3d1928a8b0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.5.4"; + version = "10.5.6"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1fsz2rdfcb1a2a2jwl8009r8ldi1rg8rj07751lgwy52jdp1ihka"; + sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; }; in @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1glvqzbspaw88nwmgpxvkz52a4pz3wp3h5xs1f9kc32k2vh384nz"; + sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; }; buildInputs = [ @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-hardcoded-locations.patch - ./nulladapter.patch ./fix-36783.patch ]; @@ -59,6 +58,8 @@ stdenv.mkDerivation rec { 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 + # required for some gems: cat > config/database.yml <<EOF production: |