summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommaso Sardelli2021-01-17 14:54:45 +0100
committerTommaso Sardelli2021-01-17 14:54:45 +0100
commit4a4f264f3058d60fc3bbb2972472b47ec4ee0150 (patch)
treeef45dc6267f4b7e805ab1f60e8299b886ec7f272
parentfc13debdd7d76407ac2104b4cbedfa09035d4d19 (diff)
downloadaur-4a4f264f3058d60fc3bbb2972472b47ec4ee0150.tar.gz
Upgrade to 0.17.0 and use pure Go implementation for jsonnetfmt
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
2 files changed, 10 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c688fb523540..88db22bd19c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = go-jsonnet
pkgdesc = An implementation of Jsonnet in pure Go
- pkgver = 0.16.0
+ pkgver = 0.17.0
pkgrel = 1
url = https://jsonnet.org/
arch = x86_64
@@ -9,10 +9,8 @@ pkgbase = go-jsonnet
provides = jsonnet
conflicts = jsonnet
conflicts = go-jsonnet-git
- source = jsonnet_v0.16.0.tar.gz::https://github.com/google/jsonnet/archive/v0.16.0.tar.gz
- source = go-jsonnet_v0.16.0.tar.gz::https://github.com/google/go-jsonnet/archive/v0.16.0.tar.gz
- sha512sums = 80e0403ec8008cbacff8d9e8fe0e2b5d3bfa306d92c2c11d472e5721015ce4c11be745df10d25715f22f8d8594df69fabf2fe617bdded462ffc5b21f8923606f
- sha512sums = 741fc0ed5e59960c175afb463dfc38007935d4f9f15fe30088aecfe1cc7825ca637989f06716068e267b92c45fbab6e47a865f0c0e83df6d2bf2fc4f1cd39a9a
+ source = go-jsonnet_v0.17.0.tar.gz::https://github.com/google/go-jsonnet/archive/v0.17.0.tar.gz
+ sha512sums = d5315ff178824a07f9094fb436e0ecd54f87618cbac421de8ac89afb6c09ef44a7e1615f5ef26b4e67535d0ae0f5662bdf3e3cbe36f126eef2ce5cadcccffdb8
pkgname = go-jsonnet
diff --git a/PKGBUILD b/PKGBUILD
index 92963c5a33f1..174245ff95aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tommaso Sardelli <lacapannadelloziotom [AT] gmail [DOT] com>
pkgname=go-jsonnet
_basepkgname=jsonnet
-pkgver=0.16.0
+pkgver=0.17.0
pkgrel=1
pkgdesc="An implementation of Jsonnet in pure Go"
arch=("x86_64")
@@ -10,10 +10,8 @@ license=("Apache")
makedepends=("go")
conflicts=('jsonnet' 'go-jsonnet-git')
provides=('jsonnet')
-source=("${_basepkgname}_v${pkgver}.tar.gz::https://github.com/google/${_basepkgname}/archive/v${pkgver}.tar.gz"
- "${pkgname}_v${pkgver}.tar.gz::https://github.com/google/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('80e0403ec8008cbacff8d9e8fe0e2b5d3bfa306d92c2c11d472e5721015ce4c11be745df10d25715f22f8d8594df69fabf2fe617bdded462ffc5b21f8923606f'
- '741fc0ed5e59960c175afb463dfc38007935d4f9f15fe30088aecfe1cc7825ca637989f06716068e267b92c45fbab6e47a865f0c0e83df6d2bf2fc4f1cd39a9a')
+source=("${pkgname}_v${pkgver}.tar.gz::https://github.com/google/${pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('d5315ff178824a07f9094fb436e0ecd54f87618cbac421de8ac89afb6c09ef44a7e1615f5ef26b4e67535d0ae0f5662bdf3e3cbe36f126eef2ce5cadcccffdb8')
prepare() {
export GOPATH="${srcdir}"
@@ -23,26 +21,16 @@ prepare() {
}
build() {
- # Build jsonnet Go implementation
cd "$srcdir/${pkgname}-${pkgver}"
go build ./cmd/jsonnet
-
- # Build jsonnetfmt from the C++ implementation
- cd "$srcdir/$_basepkgname-$pkgver"
- CFLAGS="$CFLAGS -fPIC -Iinclude" CXXFLAGS="$CXXFLAGS -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json" make jsonnetfmt
+ go build ./cmd/jsonnetfmt
+ go build ./cmd/jsonnet-deps
}
-check() {
- cd "$srcdir/$_basepkgname-$pkgver"
- CFLAGS="$CFLAGS -fPIC -Iinclude" make test
-}
package() {
- # Install jsonnet
cd "$srcdir/${pkgname}-${pkgver}"
install -Dm755 jsonnet "$pkgdir/usr/bin/jsonnet"
-
- # Install jsonnetfmt
- cd "$srcdir/$_basepkgname-$pkgver"
- install -m755 jsonnetfmt "$pkgdir/usr/bin/jsonnetfmt"
+ install -Dm755 jsonnetfmt "$pkgdir/usr/bin/jsonnetfmt"
+ install -Dm755 jsonnet-deps "$pkgdir/usr/bin/jsonnet-deps"
}