bert/aur
1
0
Fork 0
mirror of https://github.com/bertptrs/aur.git synced 2025-12-27 13:30:31 +01:00
Code Issues Projects Releases Wiki Activity

Update to 2.3.1; remove archlinux-nix dep

Browse Source
This commit is contained in:
Alastair Pharo
2019-10-15 22:12:50 +11:00
parent 26fe114f37
commit 85d7e5b9f8
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.SRCINFO
View File

@@ -1,7 +1,7 @@
pkgbase = nix pkgbase = nix
pkgdesc = A purely functional package manager pkgdesc = A purely functional package manager
pkgver = 2.2.2 pkgver = 2.3.1
pkgrel = 3 pkgrel = 1
url = https://nixos.org/nix url = https://nixos.org/nix
install = nix.install install = nix.install
arch = i686 arch = i686
@@ -15,9 +15,9 @@ pkgbase = nix
depends = boost depends = boost
depends = brotli depends = brotli
depends = editline depends = editline
depends = archlinux-nix optdepends = archlinux-nix: tools to help with setup of Nix
source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz source = https://nixos.org/releases/nix/nix-2.3.1/nix-2.3.1.tar.xz
sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c sha256sums = bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b
pkgname = nix pkgname = nix

9
PKGBUILD
View File

@@ -7,17 +7,18 @@
# Contributor: Anders Bennehag # Contributor: Anders Bennehag
pkgname=nix pkgname=nix
pkgver=2.2.2 pkgver=2.3.1
pkgrel=3 pkgrel=1
pkgdesc="A purely functional package manager" pkgdesc="A purely functional package manager"
arch=('i686' 'x86_64' 'armv7h') arch=('i686' 'x86_64' 'armv7h')
url="https://nixos.org/nix" url="https://nixos.org/nix"
license=('LGPL') license=('LGPL')
depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'archlinux-nix') depends=('gc' 'libsodium' 'boost' 'brotli' 'editline')
optdepends=('archlinux-nix: tools to help with setup of Nix')
makedepends=('bzip2' 'openssl') makedepends=('bzip2' 'openssl')
install=nix.install install=nix.install
source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz")
sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c') sha256sums=('bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b')
prepare() { prepare() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"

27
nix.install
View File

@@ -1,13 +1,7 @@
install_info() { install_info() {
echo "Nix is installed and configured, and the nix-daemon should be running. To check," echo "Nix is installed but no configuration has been done to make it work."
echo "you can run:" echo "You may wish to install the archlinux-nix package from AUR to help set"
echo echo "things up."
echo " archlinux-nix status"
echo
echo "Each user's environment is setup on login. Alternatively, you can execute the"
echo "following to avoid having to log back in:"
echo
echo " source /etc/profile.d/nix{,-daemon}.sh"
echo echo
echo "For more information on how to use nix, check out Part III of the Nix Manual:" echo "For more information on how to use nix, check out Part III of the Nix Manual:"
echo echo
@@ -21,29 +15,18 @@ remove_info() {
echo "1. delete /nix folder" echo "1. delete /nix folder"
echo " # rm -r /nix" echo " # rm -r /nix"
echo echo
echo "2. delete the build users (if any)" echo "2. delete the config dir"
echo " # archlinux-nix delete-build-group"
echo
echo "3. delete the config dir"
echo " # rm -r /etc/nix" echo " # rm -r /etc/nix"
echo echo
echo "4. uninstall the archlinux-nix tool" echo "3. you may also want to delete nix-related files from users' home dirs"
echo " pacman -R archlinux-nix"
echo
echo "5. you may also want to delete nix-related files from users' home dirs"
echo " # rm -r /root/.nix-* /home/*/.nix-*" echo " # rm -r /root/.nix-* /home/*/.nix-*"
echo echo
} }
post_install() { post_install() {
archlinux-nix bootstrap
install_info install_info
} }
post_upgrade() {
archlinux-nix bootstrap
}
post_remove() { post_remove() {
remove_info remove_info
} }