Update bat and make the url dynamic (#16127)

* Update bat and make the url dynamic

- Now depending on the version it will calculate
the url

- This also fixes a weird issue that was reported
on Darwin, back when I reported that Rust wasn't
linking properly on Darwin #15887 on the comment
by hartzell i was also experiencing this issue

* Remove unnecessary stuff

- Removes the need for LLVM

- Removes the need for version calculation.

* Keep the versions on 1 line

* Pass flake8 tests
This commit is contained in:
Diego Magdaleno 2020-04-27 19:40:35 -05:00 committed by GitHub
parent cd56882998
commit f1a7fb2ffc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,9 +9,10 @@
class Bat(Package): class Bat(Package):
"""A cat(1) clone with wings.""" """A cat(1) clone with wings."""
homepage = "https://github.com/sharkdp/bat" homepage = 'https://github.com/sharkdp/bat'
url = "https://github.com/sharkdp/bat/archive/v0.10.0.tar.gz" url = 'https://github.com/sharkdp/bat/archive/v0.13.0.tar.gz'
version('0.13.0', sha256='f4aee370013e2a3bc84c405738ed0ab6e334d3a9f22c18031a7ea008cd5abd2a')
version('0.12.1', sha256='1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2') version('0.12.1', sha256='1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2')
depends_on('rust') depends_on('rust')
@ -19,11 +20,3 @@ class Bat(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
cargo = which('cargo') cargo = which('cargo')
cargo('install', '--root', prefix, '--path', '.') cargo('install', '--root', prefix, '--path', '.')
# cargo seems to need these to be set so that when it's building
# onig_sys it can run llvm-config and link against libclang.
def setup_build_environment(self, env):
env.append_flags('LLVM_CONFIG_PATH',
join_path(self.spec['llvm'].prefix.libexec.llvm,
'llvm-config'))
env.append_flags('LIBCLANG_PATH', self.spec['llvm'].prefix.lib)