Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / nix
Commits:
d0d1b42f by Caleb Maclennan at 2023-10-10T16:06:09+03:00
upgpkg: 2.18.1-1
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = nix
pkgdesc = A purely functional package manager
- pkgver = 2.17.0
- pkgrel = 5
+ pkgver = 2.18.1
+ pkgrel = 1
url = https://nixos.org/nix
arch = x86_64
license = LGPL
@@ -29,7 +29,7 @@ pkgbase = nix
makedepends = openssl
makedepends = rapidcheck
makedepends = sqlite
- source =
nix::git+https://github.com/NixOS/nix.git#commit=a212300a1d9f9c7b0daf19c00c87fc50480f54f4
+ source =
nix::git+https://github.com/NixOS/nix.git#commit=f5f4de6a550327b4b1a06123c2e450f1b92c73b6
source = nix.conf
source = sysusers.conf
source = tmpfiles.conf
=====================================
PKGBUILD
=====================================
@@ -3,9 +3,9 @@
pkgbase=nix
pkgname=('nix' 'nix-docs')
-pkgver=2.17.0
-_commit='a212300a1d9f9c7b0daf19c00c87fc50480f54f4'
-pkgrel=5
+pkgver=2.18.1
+_commit='f5f4de6a550327b4b1a06123c2e450f1b92c73b6'
+pkgrel=1
pkgdesc='A purely functional package manager'
arch=('x86_64')
url='https://nixos.org/nix'
@@ -64,16 +64,6 @@ prepare() {
cd "$pkgbase"
sed -i "s:\$(bindir):src/nix:g" doc/manual/local.mk
-
- # 1
- # https://github.com/NixOS/nix/issues/8737
- # https://github.com/NixOS/nix/pull/8936
- # 2
- # https://github.com/NixOS/nix/issues/8824
- # https://github.com/NixOS/nix/pull/8825
- git cherry-pick --no-commit \
- d0dd37b2a6d2fb6f9f906bdad52f76323d0606fb \
- b74962c92b2d8d9b957934e0aefcf4983169ae1e
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/d0d1b42f584532a40707656e0b1e128c35fa7d91
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/d0d1b42f584532a40707656e0b1e128c35fa7d91
You're receiving this email because of your account on gitlab.archlinux.org.
