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.

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

ripgrep: 0.7.1 -> 0.8.0, install shell completions #34888

Merged
merged 1 commit into from Feb 15, 2018
Merged

ripgrep: 0.7.1 -> 0.8.0, install shell completions #34888

merged 1 commit into from Feb 15, 2018

Conversation

dywedir
Copy link
Member

@dywedir dywedir commented Feb 12, 2018

https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#080-2017-02-11

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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.

@Mic92
Copy link
Member

Mic92 commented Feb 12, 2018

@GrahamcOfBorg build ripgrep

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/.fingerprint'
cp: -r not specified; omitting directory 'target/release/incremental'
cp: -r not specified; omitting directory 'target/release/deps'
cp: -r not specified; omitting directory 'target/release/native'
cp: -r not specified; omitting directory 'target/release/examples'
post-installation fixup
cp: missing destination file operand after '/nix/store/i4igandv5pizi8n8h62pcv62bp6g45za-ripgrep-0.8.0/man/man1/'
Try 'cp --help' for more information.
builder for ‘/nix/store/nmww0mc3yqqc9n4ivywhp4rb7d9s2jgp-ripgrep-0.8.0.drv’ failed with exit code 1
error: build of ‘/nix/store/nmww0mc3yqqc9n4ivywhp4rb7d9s2jgp-ripgrep-0.8.0.drv’ failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/examples'
cp: -r not specified; omitting directory 'target/release/deps'
cp: -r not specified; omitting directory 'target/release/build'
post-installation fixup
moving /nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0/man to /nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0/share/man
gzipping man pages under /nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0/share/man/
strip is /nix/store/5a88zk3jgimdmzg8rfhvm93kxib3njf9-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0/bin
patching script interpreter paths in /nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0
/nix/store/k0afq8w7wwn7kgb5zqzdg2r5lgva1587-ripgrep-0.8.0

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/0jribyf3qxfdl60lgpqgnfali7ai95ib-rust_serde_derive-1.0.18.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/kyglwvsprq1in2xnjg6mx9rnccidmy6f-rust_crates-io-0.11.0.drv': 30 dependencies couldn't be built
cannot build derivation '/nix/store/49yfi2522frhdq6i8hms6hjndqhv6sik-rust_docopt-0.8.1.drv': 19 dependencies couldn't be built
cannot build derivation '/nix/store/x3nxrrggzq7znif7b32kb3a7f1rz4a49-rust_git2-curl-0.7.0.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/nzrc7j57fzrya5qyl7vqnr1rqhjg40g4-rust_ignore-0.2.2.drv': 18 dependencies couldn't be built
cannot build derivation '/nix/store/m9aq2m4jb4whd51c8jcrhvgp6igwdjqz-rust_cargo-0.22.0.drv': 78 dependencies couldn't be built
cannot build derivation '/nix/store/ir9aw7rf74r0qyxj79wbn3609prgr23c-rust_cargo-vendor-0.1.13.drv': 79 dependencies couldn't be built
cannot build derivation '/nix/store/g8wc77k90c5z5l5gmprr142mh8rnyrf7-ripgrep-0.8.0-vendor.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/zfiy5gi560gcfzxb8pw0fry92nnf6csw-ripgrep-0.8.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/zfiy5gi560gcfzxb8pw0fry92nnf6csw-ripgrep-0.8.0.drv' failed


preFixup = ''
mkdir -p "$out/man/man1"
cp "$src/doc/rg.1" "$out/man/man1"
cp target/release/build/ripgrep-*/out/rg.1 "$out/man/man1/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I build with your changes locally and the manpage can be found in the following path: ./source/target/release/build/ripgrep-f969427e20cd23eb/out/rg.1.txt

Copy link
Member Author

@dywedir dywedir Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manpage should be built from this file with a2x --no-xmllint --doctype manpage --format manpage rg.1.txt (see https://github.com/BurntSushi/ripgrep/blob/master/build.rs#L73:L97).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh yeah :( Any idea why the correct file is not created?

Copy link
Member Author

@dywedir dywedir Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unable to reproduce on NixOS and on other Linux distribution

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, for me it still does not work. If you want, I can look at it tomorrow.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can reproduce the error

Copy link
Member Author

@dywedir dywedir Feb 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I messed up. Sandboxing was actually disabled 🤦‍♂️
Now I can repro.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got it to work with asciidocFull instead of asciidoc (#34967). asciidoc should also be added to buildInputs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can't it be a native input? It's a build time dependency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah you're right, it should be a native input.


mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions}
cp target/release/build/ripgrep-*/out/rg.bash "$out/share/bash-completion/completions/"
cp target/release/build/ripgrep-*/out/rg.fish "$out/share/fish/completions/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you install the fish completions on /share/fish/vendor_completions.d/ ? It's where they are expected:

# include programs that bring their own completions
environment.pathsToLink = []
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";

Copy link
Member Author

@dywedir dywedir Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, thanks!

@Mic92
Copy link
Member

Mic92 commented Feb 13, 2018

@GrahamcOfBorg build ripgrep

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/examples'
cp: -r not specified; omitting directory 'target/release/deps'
cp: -r not specified; omitting directory 'target/release/build'
post-installation fixup
moving /nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0/man to /nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0/share/man
gzipping man pages under /nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0/share/man/
strip is /nix/store/5a88zk3jgimdmzg8rfhvm93kxib3njf9-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0/bin
patching script interpreter paths in /nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0
/nix/store/k2cbdg2p6ba9gwr32kr1a1xgigvna562-ripgrep-0.8.0

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/.fingerprint'
cp: -r not specified; omitting directory 'target/release/incremental'
cp: -r not specified; omitting directory 'target/release/deps'
cp: -r not specified; omitting directory 'target/release/native'
cp: -r not specified; omitting directory 'target/release/examples'
post-installation fixup
cp: missing destination file operand after '/nix/store/dbpfpjx44p4g9dbw6wqzcdpsa4ac1w4w-ripgrep-0.8.0/man/man1/'
Try 'cp --help' for more information.
builder for ‘/nix/store/6sp2846z16mzyr36asf462k8wkbyjjdk-ripgrep-0.8.0.drv’ failed with exit code 1
error: build of ‘/nix/store/6sp2846z16mzyr36asf462k8wkbyjjdk-ripgrep-0.8.0.drv’ failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/abhcmnb13wdgm4x94j8xv70kwkqb5jgx-rust_serde_derive-1.0.18.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/q7x2vygi3zx94iznmhhc550v9nwrfyq5-rust_crates-io-0.11.0.drv': 30 dependencies couldn't be built
cannot build derivation '/nix/store/5q0f27nqvgpwlx15pinpvi3b4kvfz2mx-rust_docopt-0.8.1.drv': 19 dependencies couldn't be built
cannot build derivation '/nix/store/gkqnak4fd86jlrjdl84dbvsa4qkran1y-rust_git2-curl-0.7.0.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/sid4kn26d0nvhsz1qsx735icn3qq5mal-rust_ignore-0.2.2.drv': 18 dependencies couldn't be built
cannot build derivation '/nix/store/myjdc9w75zws6ngrsf9g0nb4brmka3a6-rust_cargo-0.22.0.drv': 78 dependencies couldn't be built
cannot build derivation '/nix/store/lxkalvjcwxbpnxjcdw08hiwpv1rdkmgv-rust_cargo-vendor-0.1.13.drv': 79 dependencies couldn't be built
cannot build derivation '/nix/store/15bj157l3b9qrrfx552vxvwxfb3asyzj-ripgrep-0.8.0-vendor.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/x1mj2i30gx19k2w02rxmrj8bgr9mhz0r-ripgrep-0.8.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/x1mj2i30gx19k2w02rxmrj8bgr9mhz0r-ripgrep-0.8.0.drv' failed

@dywedir
Copy link
Member Author

dywedir commented Feb 13, 2018

@GrahamcOfBorg build ripgrep

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
moving /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0/man to /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0/share/man
shrinking RPATHs of ELF executables and libraries in /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0
shrinking /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0/bin/rg
gzipping man pages under /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0/bin 
patching script interpreter paths in /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0
checking for references to /tmp/nix-build-ripgrep-0.8.0.drv-0 in /nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0...
/nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/abhcmnb13wdgm4x94j8xv70kwkqb5jgx-rust_serde_derive-1.0.18.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/q7x2vygi3zx94iznmhhc550v9nwrfyq5-rust_crates-io-0.11.0.drv': 30 dependencies couldn't be built
cannot build derivation '/nix/store/5q0f27nqvgpwlx15pinpvi3b4kvfz2mx-rust_docopt-0.8.1.drv': 19 dependencies couldn't be built
cannot build derivation '/nix/store/gkqnak4fd86jlrjdl84dbvsa4qkran1y-rust_git2-curl-0.7.0.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/sid4kn26d0nvhsz1qsx735icn3qq5mal-rust_ignore-0.2.2.drv': 18 dependencies couldn't be built
cannot build derivation '/nix/store/myjdc9w75zws6ngrsf9g0nb4brmka3a6-rust_cargo-0.22.0.drv': 78 dependencies couldn't be built
cannot build derivation '/nix/store/lxkalvjcwxbpnxjcdw08hiwpv1rdkmgv-rust_cargo-vendor-0.1.13.drv': 79 dependencies couldn't be built
cannot build derivation '/nix/store/15bj157l3b9qrrfx552vxvwxfb3asyzj-ripgrep-0.8.0-vendor.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/6cglw3aryziq8w5xw3bf3g7asvmwmng8-ripgrep-0.8.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/6cglw3aryziq8w5xw3bf3g7asvmwmng8-ripgrep-0.8.0.drv' failed

@timokau timokau mentioned this pull request Feb 14, 2018
8 tasks
@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

@GrahamcOfBorg build ripgrep

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/wg86xpzayw3gfb78isqdzicp0yfsqk0l-ripgrep-0.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/examples'
cp: -r not specified; omitting directory 'target/release/incremental'
cp: -r not specified; omitting directory 'target/release/native'
post-installation fixup
moving /nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0/man to /nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0/share/man
gzipping man pages under /nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0/share/man/
strip is /nix/store/5a88zk3jgimdmzg8rfhvm93kxib3njf9-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0/bin
patching script interpreter paths in /nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0
/nix/store/zy2q74ri65rqlbnb3y4n78kj97xlcx9v-ripgrep-0.8.0

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/phxvsacm9fscdc34kqhffh4m2q7vbhgh-rust_serde_derive-1.0.18.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/83qr95ip9y1rjw538vfvn4893zca3sy3-rust_crates-io-0.11.0.drv': 30 dependencies couldn't be built
cannot build derivation '/nix/store/lba9xlwr92h6bq8gkdzli59chqli3q3i-rust_docopt-0.8.1.drv': 19 dependencies couldn't be built
cannot build derivation '/nix/store/203x9kqfg4hzk4bym4zr1rg5zgra5p3v-rust_git2-curl-0.7.0.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/vafvjkb28ms4cc5mz964acr26bkd5hnl-rust_ignore-0.2.2.drv': 18 dependencies couldn't be built
cannot build derivation '/nix/store/c3rvsymm70234ymfdl9vn6a6jrvkv7i2-rust_cargo-0.22.0.drv': 78 dependencies couldn't be built
cannot build derivation '/nix/store/c3fyrgq7w8midwqappsxdxwz2947z4w1-rust_cargo-vendor-0.1.13.drv': 79 dependencies couldn't be built
cannot build derivation '/nix/store/0ihsqw4pfmxgsa6rrgirjiifrj3xp34z-ripgrep-0.8.0-vendor.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/d6vkjg91v3x81kzw7n8yv0cpfki906pz-ripgrep-0.8.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/d6vkjg91v3x81kzw7n8yv0cpfki906pz-ripgrep-0.8.0.drv' failed

@LnL7 LnL7 merged commit 99913c4 into NixOS:master Feb 15, 2018
@dywedir dywedir deleted the ripgrep branch February 20, 2018 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants