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

notmuch: fix version wildcard #34577

Merged
merged 1 commit into from Feb 7, 2018
Merged

notmuch: fix version wildcard #34577

merged 1 commit into from Feb 7, 2018

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Feb 4, 2018 •
edited

talloc is now 2.1.11 and the find '?' only matches one digit so it fails on 11. This switches it to use the '*' wildcard.

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.

@matthewbauer
notmuch: fix version wildcard
ac4ffde 
talloc is now 2.1.11 and the find '?' only matches one digit so it fails on 11. This switches it to use the '*' wildcard.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

  /nix/store/r4j40rjw1bd7flimr584dpqg074i8m47-notmuch-0.26
  /nix/store/rf0xn0247dzrr09nw1q784m3ksi80dql-xapian-1.4.5
  /nix/store/v37zalvjzm7nvml7hm2qdl2nqcs3z9mg-libidn-1.33
copying path '/nix/store/9vb414ad6c53v9cgij273bhybk302d75-talloc-2.1.11' from 'https://cache.nixos.org'...
copying path '/nix/store/rf0xn0247dzrr09nw1q784m3ksi80dql-xapian-1.4.5' from 'https://cache.nixos.org'...
copying path '/nix/store/gc3ffmq3vwpkq4cj015yvvmnb22s86xv-gpgme-1.10.0' from 'https://cache.nixos.org'...
copying path '/nix/store/v37zalvjzm7nvml7hm2qdl2nqcs3z9mg-libidn-1.33' from 'https://cache.nixos.org'...
copying path '/nix/store/l4cfvl0p7z34djvldbykscy34lzd02i2-gmime-3.0.5' from 'https://cache.nixos.org'...
copying path '/nix/store/r4j40rjw1bd7flimr584dpqg074i8m47-notmuch-0.26' from 'https://cache.nixos.org'...
/nix/store/r4j40rjw1bd7flimr584dpqg074i8m47-notmuch-0.26

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26
shrinking /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26/bin/notmuch
shrinking /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26/lib/libnotmuch.so.5.0.0
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26/lib  /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26/bin 
patching script interpreter paths in /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26
/nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26/bin/notmuch-emacs-mua: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-notmuch-0.26.drv-0 in /nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26...
/nix/store/9zmd5dpax42a13ly2q1g3p6ki9s60ihj-notmuch-0.26

andir
andir approved these changes Feb 5, 2018
View reviewed changes
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@matthewbauer do you know of a way we could fix that in the upstream buildsystem or have it less "hacky"?

@matthewbauer
Copy link
Member Author

@andir Since we're building from source it's definitely possible to fix. It looks like they're using a custom configure script so it could be an issue in that.

@matthewbauer
Copy link
Member Author

/cc @LnL7

@LnL7 LnL7 merged commit d74a750 into NixOS:master Feb 7, 2018
@matthewbauer matthewbauer deleted the patch-8 branch February 22, 2019 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andir andir andir approved these changes

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@matthewbauer @GrahamcOfBorg @andir @LnL7