Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cbeea5918da8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef047e711cca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 29, 2019

  1. nixos/gitlab: Install and fixup vendorised gitlab-shell 

    gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.
    @bgamari
    bgamari committed Mar 29, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 226A2D41EF5378C9
    Learn about vigilant mode
    Copy the full SHA
    50a4de7 View commit details

  2. Merge pull request #58545 from bgamari/gitaly-fixup-gitlab-shell 

     nixos/gitlab: Install and fixup vendorised gitlab-shell
    @flokli
    flokli authored Mar 29, 2019
    Copy the full SHA
    ef047e7 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/applications/version-management/gitlab/gitaly/default.nix
9 changes: 8 additions & 1 deletion pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,14 @@ in buildGoPackage rec {

postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib} $ruby
cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby
# gitlab-shell will try to read its config relative to the source
# code by default which doesn't work in nixos because it's a
# read-only filesystem
substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \
"File.join(ROOT_PATH, 'config.yml')" \
"'/run/gitlab/shell-config.yml'"
'';

outputs = [ "bin" "out" "ruby" ];