Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gitaly: Cause ruby-cd to be wrapped so bundler will work #41566

Merged
merged 1 commit into from Jun 11, 2018
Merged

gitaly: Cause ruby-cd to be wrapped so bundler will work #41566

merged 1 commit into from Jun 11, 2018

Conversation

krav
Copy link
Contributor

@krav krav commented Jun 6, 2018

Motivation for this change

Gitaly is broken. It handles dependencies by calling bundler. ruby-cd needs to be wrapped for it to work.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@krav krav mentioned this pull request Jun 6, 2018
Merged
8 tasks
@xeji
Copy link
Contributor

xeji commented Jun 8, 2018

@GrahamcOfBorg build gitaly

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: gitaly

Partial log (click to expand)

Successfully installed github-linguist-5.3.3
1 gem installed
post-installation fixup
patching script interpreter paths in /nix/store/yl87yp8zgg2lbki34ndf1xjbswmc7s9n-ruby2.4.4-github-linguist-5.3.3
/nix/store/yl87yp8zgg2lbki34ndf1xjbswmc7s9n-ruby2.4.4-github-linguist-5.3.3/lib/ruby/gems/2.4.0/gems/github-linguist-5.3.3/bin/git-linguist: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/0xzzx8zlj1486mvjjf85z15g985wjwzx-ruby-2.4.4/bin/ruby"
/nix/store/yl87yp8zgg2lbki34ndf1xjbswmc7s9n-ruby2.4.4-github-linguist-5.3.3/lib/ruby/gems/2.4.0/gems/github-linguist-5.3.3/bin/linguist: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/0xzzx8zlj1486mvjjf85z15g985wjwzx-ruby-2.4.4/bin/ruby"
cannot build derivation '/nix/store/zc705l1icyahqbig5vf8bpcv5g2g86j1-gitaly-env.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/mzg1n7q512fdf3ddbpm9p36wiw1m0vcy-wrapped-ruby-gitaly-env.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/wny148pvwhnhwb9iaaprw8wd8a5hfwz4-gitaly-0.100.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/wny148pvwhnhwb9iaaprw8wd8a5hfwz4-gitaly-0.100.0.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitaly

Partial log (click to expand)

checking for references to /build in /nix/store/lcp9qd2l9n6y02rdcc8z42hsxkrxg4xq-gitaly-0.100.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby/lib  /nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby/bin
patching script interpreter paths in /nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby
/nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby/bin/gitaly-ruby: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/yvahpqzchzvznic694fbh1g09p10vib1-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby/bin/ruby-cd: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/yvahpqzchzvznic694fbh1g09p10vib1-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby/vendor/gitlab_git/lib/gitlab/git/support/format-git-cat-file-input: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/yvahpqzchzvznic694fbh1g09p10vib1-wrapped-ruby-gitaly-env/bin/ruby"
checking for references to /build in /nix/store/m05ghih1n8yzbbmcmc098hw32gl5wslv-gitaly-0.100.0-ruby...
/nix/store/kdaiap4gx8ys3qxp265bp09sfzdrrhzv-gitaly-0.100.0-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gitaly

Partial log (click to expand)

checking for references to /build in /nix/store/yqhk1b6qdy0xvs5qylynwncagc6x8ls8-gitaly-0.100.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby
strip is /nix/store/qg2agrqkf240s656d207zqhipl0bc2id-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby/lib  /nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby/bin
patching script interpreter paths in /nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby
/nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby/vendor/gitlab_git/lib/gitlab/git/support/format-git-cat-file-input: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/appd4jf93jn0pbycs3m54iayn3sib4gn-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby/bin/ruby-cd: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/appd4jf93jn0pbycs3m54iayn3sib4gn-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby/bin/gitaly-ruby: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/appd4jf93jn0pbycs3m54iayn3sib4gn-wrapped-ruby-gitaly-env/bin/ruby"
checking for references to /build in /nix/store/cvgga3qwa0nhblxd07vziif3297854yw-gitaly-0.100.0-ruby...
/nix/store/q9mfgs0m7dwsbswagw2wbjzsscappmb9-gitaly-0.100.0-bin

@Mic92 Mic92 merged commit 8ba3df7 into NixOS:master Jun 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@krav @xeji @GrahamcOfBorg @Mic92