From 53f3ef09f4cb6d544dd389a3235643e3f4861e21 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 7 Dec 2018 17:47:43 -0500
Subject: [PATCH] PKGBUILDs: Merge tari-dev with tari-core

Not all of these packages may be useful to everyone, and that's fine.
Any list I create won't satisfy everyone, but reducing the number of
PKGBUILDs makes it easier to see and change all the packages installed
on the system as a whole.

Due to the nature of how Arch Linux works, most users won't even need my
PKGBUILDs. With the exception of setting up X with a bare-minimum window
manager, installing and configuring most software is as simple as using
pacman to install that software and symlinking any config files you want
to their relevant directories, if any.
---
 .archlinux/PKGBUILDs/tari-core/PKGBUILD | 33 ++++++++++++++++++++++--
 .archlinux/PKGBUILDs/tari-dev/PKGBUILD  | 34 -------------------------
 2 files changed, 31 insertions(+), 36 deletions(-)
 delete mode 100644 .archlinux/PKGBUILDs/tari-dev/PKGBUILD

diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
index f493703b..0fc275fe 100644
--- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tari-core
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="My Arch Linux setup"
 arch=('any')
@@ -32,4 +32,33 @@ depends=(stow
          cmatrix
          imagemagick
          lolcat
-         figlet)
+         figlet
+         vim
+         neovim
+         httpie
+         rsync
+         git
+         tig
+         diff-so-fancy
+         tmux
+         nodejs
+         npm
+         yarn
+         crystal
+         shards
+         llvm
+         rustup
+         ansible
+         docker
+         docker-compose
+         bind-tools
+         pacman-contrib
+         nginx-mainline
+         jdk-openjdk
+         texlive-core
+         texlive-science
+         texlive-humanities
+         texlive-fontsextra
+         texlive-latexextra
+         texlive-bibtexextra
+         minted)
diff --git a/.archlinux/PKGBUILDs/tari-dev/PKGBUILD b/.archlinux/PKGBUILDs/tari-dev/PKGBUILD
deleted file mode 100644
index b01b36dc..00000000
--- a/.archlinux/PKGBUILDs/tari-dev/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=tari-dev
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Packages I use relating to development and other things."
-arch=('any')
-depends=(vim
-         neovim
-         httpie
-         rsync
-         git
-         tig
-         diff-so-fancy
-         tmux
-         nodejs
-         npm
-         yarn
-         crystal
-         shards
-         llvm
-         rustup
-         ansible
-         docker
-         docker-compose
-         bind-tools
-         pacman-contrib
-         nginx-mainline
-         jdk-openjdk
-         texlive-core
-         texlive-science
-         texlive-humanities
-         texlive-fontsextra
-         texlive-latexextra
-         texlive-bibtexextra
-         minted)