upd(lix-git): 2.90 -> 2.92.0

packagelist

@@ -255,7 +255,7 @@ libcamera-git
 libcutefish-git
 libdisplay-info-git
 libdrm
-libeditline-troglobit
+libeditline-troglobit-git
 libfdk-aac1-deb
 libgc-nix
 libicu-deb

packages/libeditline-troglobit/.SRCINFO → packages/libeditline-troglobit-git/.SRCINFO

@@ -1,4 +1,5 @@
-pkgbase = libeditline-troglobit
+pkgbase = libeditline-troglobit-git
+	gives = libeditline-troglobit
 	pkgver = 1.17.1
 	pkgdesc = A readline() replacement for UNIX without termcap (ncurses)
 	url = https://troglobit.com/projects/editline/
@@ -7,6 +8,6 @@ pkgbase = libeditline-troglobit
 	license = custom:permissive
 	maintainer = vigress8 <[email protected]>
 	repology = project: editline-troglobit
-	source = libeditline-troglobit::https://github.com/troglobit/editline.git#tag=1.17.1
+	source = libeditline-troglobit::https://github.com/troglobit/editline.git
 
-pkgname = libeditline-troglobit
+pkgname = libeditline-troglobit-git

packages/libeditline-troglobit/libeditline-troglobit.pacscript → packages/libeditline-troglobit-git/libeditline-troglobit-git.pacscript

@@ -1,32 +1,32 @@
-pkgname='libeditline-troglobit'
-_pkgname='editline'
+pkgname='libeditline-troglobit-git'
+gives='libeditline-troglobit'
 pkgver='1.17.1'
 pkgdesc='A readline() replacement for UNIX without termcap (ncurses)'
 url='https://troglobit.com/projects/editline/'
 license=('custom:permissive')
 makedepends=('automake' 'libtool')
 maintainer=('vigress8 <[email protected]>')
 repology=('project: editline-troglobit')
-source=("${pkgname}::https://github.com/troglobit/editline.git#tag=${pkgver}")
+source=("${gives}::https://github.com/troglobit/editline.git")
 
 build() {
-  cd "${pkgname}"
+  cd "${gives}"
   ./autogen.sh
   ./configure --prefix=/usr
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${pkgname}"
+  cd "${gives}"
   make DESTDIR="${pkgdir}" install
 
   # avoid libedit conflict
   mv "${pkgdir}"/usr/share/man/man3/editline{,-troglobit}.3
 
   # license
-  install -Dm0644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm0644 LICENSE -t "${pkgdir}/usr/share/licenses/${gives}"
 
   # additional documentation
   install -dm644 "${pkgdir}/usr/share/doc"
-  cp -r docs "${_}/${pkgname}"
+  cp -r docs "${_}/${gives}"
 }

packages/lix-git/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lix-git
 	gives = lix
-	pkgver = 2.90
+	pkgver = 2.92.0
 	pkgdesc = A modern, delicious implementation of the Nix package manager, focused on correctness, usability, and growth
 	url = https://lix.systems
 	depends = busybox-static
@@ -19,12 +19,10 @@ pkgbase = lix-git
 	depends = libssl3t64 | libssl3
 	depends = perl
 	depends = xz-utils
-	makedepends = bison
 	makedepends = busybox-static
 	makedepends = cargo
 	makedepends = cmake
 	makedepends = doxygen
-	makedepends = flex
 	makedepends = graphviz
 	makedepends = libarchive-dev
 	makedepends = libboost-container-dev
@@ -42,13 +40,14 @@ pkgbase = lix-git
 	makedepends = libtoml11-dev
 	makedepends = lowdown
 	makedepends = lsof
-	makedepends = meson
+	makedepends = meson>=1.4.0
 	makedepends = ninja-build
 	makedepends = nlohmann-json3-dev
 	makedepends = pkg-config
 	makedepends = python3
+	makedepends = tao-pegtl-dev
 	pacdeps = coreutils-single
-	pacdeps = libeditline-troglobit
+	pacdeps = libeditline-troglobit-git
 	pacdeps = libgc-nix
 	pacdeps = mdbook
 	pacdeps = mdbook-linkcheck

packages/lix-git/lix-git.pacscript

@@ -1,6 +1,6 @@
 pkgname='lix-git'
 gives='lix'
-pkgver='2.90'
+pkgver='2.92.0'
 pkgdesc='A modern, delicious implementation of the Nix package manager, focused on correctness, usability, and growth'
 url='https://lix.systems'
 source=('lix::https://github.com/lix-project/lix.git')
@@ -10,12 +10,10 @@ conflicts=('lix' 'nix-bin' 'nix-setup-systemd')
 external_connection='true'
 makedepends_amd64=('libcpuid-dev')
 makedepends=(
-  'bison'
   'busybox-static'
   'cargo'
   'cmake'
   'doxygen'
-  'flex'
   'graphviz'
   'libarchive-dev'
   'libboost-container-dev'
@@ -33,11 +31,12 @@ makedepends=(
   'libtoml11-dev'
   'lowdown'
   'lsof'
-  'meson'
+  'meson>=1.4.0'
   'ninja-build'
   'nlohmann-json3-dev'
   'pkg-config'
   'python3'
+  'tao-pegtl-dev'
 )
 depends_amd64=('libcpuid16')
 depends=(
@@ -58,35 +57,29 @@ depends=(
   'perl'
   'xz-utils'
 )
+# FIXME: tests are disabled since librapidcheck-dev is broken.
+# Uncomment once the below PR is merged
+# https://salsa.debian.org/debian/rapidcheck/-/merge_requests/1
 #checkdepends=(
 #  'libgmock-dev'
 #  'libgtest-dev'
 #  'librapidcheck-dev'
 #)
 pacdeps=(
   'coreutils-single'
-  'libeditline-troglobit'
+  'libeditline-troglobit-git'
   'libgc-nix'
   'mdbook'
   'mdbook-linkcheck'
 )
 
 prepare() {
   cd lix
-  sed -i '1c #!/usr/bin/env bash' \
-    doc/manual/process-includes.sh \
-    doc/manual/render-manpage.sh \
-    tests/functional/install-darwin.sh
-  env -C lix-doc CARGO_HOME=crates \
-    cargo fetch --locked
+  cargo fetch --locked
 }
 
 build() {
   cd lix
-  env -C lix-doc CARGO_HOME=crates \
-    cargo build -j"${NCPU}" --release --offline
-  export LIBRARY_PATH=${PWD}/lix-doc/target/release
-
   local mesonflags=(
     -Db_lto=true
     -Denable-docs=true
@@ -97,10 +90,9 @@ build() {
     -Dstate-dir=/nix/var
     -Dstore-dir=/nix/store
     -Dsysconfdir=/etc
-    #-Dtests-brief=true
   )
   meson setup build "${mesonflags[@]}"
-  ninja -j"${NCPU}" -C build
+  meson compile -C build
 }
 
 #check() {
@@ -110,5 +102,5 @@ build() {
 
 package() {
   cd lix
-  DESTDIR="${pkgdir}" ninja install -C build
+  DESTDIR="${pkgdir}" meson install -C build
 }

srclist

@@ -5098,7 +5098,8 @@ pkgbase = libdrm
 
 pkgname = libdrm
 ---
-pkgbase = libeditline-troglobit
+pkgbase = libeditline-troglobit-git
+	gives = libeditline-troglobit
 	pkgver = 1.17.1
 	pkgdesc = A readline() replacement for UNIX without termcap (ncurses)
 	url = https://troglobit.com/projects/editline/
@@ -5107,9 +5108,9 @@ pkgbase = libeditline-troglobit
 	license = custom:permissive
 	maintainer = vigress8 <[email protected]>
 	repology = project: editline-troglobit
-	source = libeditline-troglobit::https://github.com/troglobit/editline.git#tag=1.17.1
+	source = libeditline-troglobit::https://github.com/troglobit/editline.git
 
-pkgname = libeditline-troglobit
+pkgname = libeditline-troglobit-git
 ---
 pkgbase = libfdk-aac1-deb
 	gives = libfdk-aac1
@@ -5620,7 +5621,7 @@ pkgname = linux-wifi-hotspot-deb
 ---
 pkgbase = lix-git
 	gives = lix
-	pkgver = 2.90
+	pkgver = 2.92.0
 	pkgdesc = A modern, delicious implementation of the Nix package manager, focused on correctness, usability, and growth
 	url = https://lix.systems
 	depends = busybox-static
@@ -5639,12 +5640,10 @@ pkgbase = lix-git
 	depends = libssl3t64 | libssl3
 	depends = perl
 	depends = xz-utils
-	makedepends = bison
 	makedepends = busybox-static
 	makedepends = cargo
 	makedepends = cmake
 	makedepends = doxygen
-	makedepends = flex
 	makedepends = graphviz
 	makedepends = libarchive-dev
 	makedepends = libboost-container-dev
@@ -5662,13 +5661,14 @@ pkgbase = lix-git
 	makedepends = libtoml11-dev
 	makedepends = lowdown
 	makedepends = lsof
-	makedepends = meson
+	makedepends = meson>=1.4.0
 	makedepends = ninja-build
 	makedepends = nlohmann-json3-dev
 	makedepends = pkg-config
 	makedepends = python3
+	makedepends = tao-pegtl-dev
 	pacdeps = coreutils-single
-	pacdeps = libeditline-troglobit
+	pacdeps = libeditline-troglobit-git
 	pacdeps = libgc-nix
 	pacdeps = mdbook
 	pacdeps = mdbook-linkcheck