[arch-commits] Commit in nix/trunk (PKGBUILD)

[George Rawlinson]

    Date: Tuesday, March 8, 2022 @ 22:11:40
  Author: grawlinson
Revision: 1145623

upgpkg: nix 2.7.0-1

New upstream release.

Modified:
  nix/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-08 22:09:22 UTC (rev 1145622)
+++ PKGBUILD	2022-03-08 22:11:40 UTC (rev 1145623)
@@ -3,8 +3,8 @@
 
 pkgbase=nix
 pkgname=('nix' 'nix-docs')
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.7.0
+pkgrel=1
 pkgdesc="A purely functional package manager"
 arch=('x86_64')
 url="https://nixos.org/nix"
@@ -29,7 +29,7 @@
   'openssl'
   'sqlite'
 )
-_commit='e044ccb67ce38d11059de32515306f5f1bd2f04f' # v2.6.1
+_commit='ffe155abd36366a870482625543f9bf924a58281' # v2.7.0
 source=(
   "$pkgbase::git+https://github.com/NixOS/nix.git#commit=$_commit"
   'nix.conf'
@@ -61,9 +61,6 @@
   cd "$pkgbase"
 
   sed -i "s:\$(bindir):src/nix:g" doc/manual/local.mk
-
-  # devendor nlohmann https://github.com/NixOS/nix/issues/5981
-  git cherry-pick --no-commit 9691f86ff71a6cd1fc0c6337fa326cb49cfb33fc
 }
 
 build() {