diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-03 18:49:18 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-04 02:29:44 +0200 |
commit | c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0 (patch) | |
tree | 380793600ff289ce3f064fdb7d0af5d04c9d152f /pkgs/applications/version-management/gitlab/default.nix | |
parent | 6e1f80eb9ddf806e40f659e57db061eb2aac7aa8 (diff) | |
download | nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar.gz nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar.bz2 nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar.lz nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar.xz nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.tar.zst nixlib-c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0.zip |
gitlab: 8.5.12 -> 8.10.3, update module
Fixes #14795.
Diffstat (limited to 'pkgs/applications/version-management/gitlab/default.nix')
-rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c3aef17513f7..fadb14dc7829 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,20 +24,19 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.5.12"; + version = "8.10.3"; - buildInputs = [ ruby bundler tzdata git nodejs procps ]; + buildInputs = [ env ruby bundler tzdata git nodejs procps ]; src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "144i97ywnr0xgm7gnwnwiy7kk5z1d71ccawl8qdhapz0705993l8"; + sha256 = "0fhnwrgrpccc2j9wgdmwwi9h1ym3ll97lhmddq0xfzivc302ri3w"; }; patches = [ ./remove-hardcoded-locations.patch - ./disable-dump-schema-after-migration.patch ./nulladapter.patch ]; @@ -66,9 +65,10 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - export GEM_HOME=${env}/${ruby.gemPath} mv config/gitlab.yml.example config/gitlab.yml - GITLAB_DATABASE_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production + GITLAB_DATABASE_ADAPTER=nulldb \ + SKIP_STORAGE_VALIDATION=true \ + rake assets:precompile RAILS_ENV=production mv config/gitlab.yml config/gitlab.yml.example mv config config.dist ''; |