diff --git a/pkgx.yaml b/pkgx.yaml index eb742df7..c9957361 100644 --- a/pkgx.yaml +++ b/pkgx.yaml @@ -1,5 +1,5 @@ dependencies: - pkgx.sh/brewkit: ^0.46 + pkgx.sh/brewkit: ^0 env: PKGX_PANTRY_PATH: ${{srcroot}} SRCROOT: ${{srcroot}} diff --git a/projects/rust-lang.org/cargo/package.yml b/projects/rust-lang.org/cargo/package.yml index 5c2d39cd..d2cbe853 100644 --- a/projects/rust-lang.org/cargo/package.yml +++ b/projects/rust-lang.org/cargo/package.yml @@ -29,13 +29,15 @@ build: tukaani.org/xz: '*' freedesktop.org/pkg-config: ^0.29 rust-lang.org/cargo: '*' - script: cargo $ARGS + script: + - | + sed -i.bak 's/^curl\s*=\s*"(.+)"$/curl = { version = "\\1", features = ["force-system-lib-on-osx"] }/' Cargo.toml + - cargo install + --root={{ prefix }} + --path=. env: - ARGS: - - install - - --root={{ prefix }} - - --path=. - + LIBGIT2_SYS_USE_PKG_CONFIG: 1 + LIBSSH2_SYS_USE_PKG_CONFIG: 1 test: env: CC: clang #FIXME diff --git a/projects/tea.xyz/brewkit/package.yml b/projects/tea.xyz/brewkit/package.yml deleted file mode 100644 index c4e7fea4..00000000 --- a/projects/tea.xyz/brewkit/package.yml +++ /dev/null @@ -1,34 +0,0 @@ -distributable: - url: https://github.com/teaxyz/brewkit/archive/refs/tags/v{{ version }}.tar.gz - strip-components: 1 - -display-name: tea/brewkit - -versions: - github: teaxyz/brewkit - -dependencies: - deno.land: '>=1.30<1.36.1' - gnu.org/bash: '*' - tea.xyz: '>=0.24.10' - -build: | - mkdir -p {{prefix}} - - rm -rf {{prefix}}/* - # ^^ because our build infra uses this pkg to build itself - - for x in bin libexec lib share deno.*; do - test -e $x && mv $x "{{prefix}}" - done - -provides: - - bin/tea-pkg - -test: - dependencies: - zlib.net: '*' - script: - pkg test zlib.net - # we would like to test builds but we need a `GITHUB_TOKEN` and - # (currently) we can’t figure out how to set that up in CI/CD