summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlaviu Tamas2022-03-28 21:36:11 -0400
committerFlaviu Tamas2022-03-28 21:36:11 -0400
commite82b3bb102e604fd0aae552ded6c5acde09849b8 (patch)
treedac2e28306f9e7e923354e5915198ec2c1873f4c
parent43fa695742b30cb7b3c7620a92a76655d1ab31fc (diff)
downloadaur-e82b3bb102e604fd0aae552ded6c5acde09849b8.tar.gz
Add conflicts line
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e59a6dee3ce8..12a7bd65cdc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,8 +18,8 @@ pkgbase = nushell-git
depends = libx11
depends = curl
optdepends = libxcb
+ conflicts = nushell
source = nushell-git::git+https://github.com/nushell/nushell.git
sha256sums = SKIP
pkgname = nushell-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4bc7a7bbe8b7..c6a4bcb48b26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=nushell
pkgname=$_pkgname-git
-pkgver=0.15.0.r2.ga268e825
+pkgver=0.60.0.r50.ga2872b4cc
pkgrel=1
makedepends=('rust' 'cargo' 'python' 'git')
# libx11 required for stable preset
@@ -15,6 +15,7 @@ source=("$pkgname::git+https://github.com/nushell/nushell.git")
url="https://www.nushell.sh"
license=('MIT')
sha256sums=('SKIP')
+conflicts=('nushell')
build() {
return 0