upd(lix-git): 2.90 -> 2.92.0

packagelist

@@ -268,7 +268,7 @@ libcs50-git
 libcutefish-git
 libdisplay-info-git
 libdrm
-libeditline-troglobit
+libeditline-troglobit-git
 libfdk-aac1-deb
 libgbinder-deb
 libgc-nix

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/
@@ -8,6 +9,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
+	source = https://github.com/lix-project/lix/raw/c95b73d8a1cce06f1ec3ee08617e76380d62f4df/nix-support/editline.patch
+	sha256sums = SKIP
+	sha256sums = 7b1cbfa7856e6190df1172031c7d670640bde7e62950342021dbecd69e299b84
 
-pkgname = libeditline-troglobit
+pkgname = libeditline-troglobit-git

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

@@ -1,5 +1,5 @@
-pkgname='libeditline-troglobit'
-_pkgname='editline'
+pkgname='libeditline-troglobit-git'
+gives='libeditline-troglobit'
 arch=("any")
 pkgver='1.17.1'
 pkgdesc='A readline() replacement for UNIX without termcap (ncurses)'
@@ -8,26 +8,34 @@ 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"
+  "https://github.com/lix-project/lix/raw/c95b73d8a1cce06f1ec3ee08617e76380d62f4df/nix-support/editline.patch"
+)
+sha256sums=(
+  'SKIP'
+  '7b1cbfa7856e6190df1172031c7d670640bde7e62950342021dbecd69e299b84'
+)
 
 build() {
-  cd "${pkgname}"
+  cd "${gives}"
+  patch -sp1 < editline.patch
   ./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/libgc-nix/.SRCINFO

@@ -1,18 +1,19 @@
 pkgbase = libgc-nix
-	pkgver = 8.2.6
+	pkgver = 8.2.8
+	epoch = 1
 	pkgdesc = The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (patched for Nix)
 	url = https://www.hboehm.info/gc/
 	arch = any
 	makedepends = pkg-config
-	replaces = libgc1
-	replaces = libgc-dev
-	provides = libgc1
-	provides = libgc-dev
+	replaces = libgc1=1:8.2.8
+	replaces = libgc-dev=1:8.2.8
+	provides = libgc1=1:8.2.8
+	provides = libgc-dev=1:8.2.8
 	maintainer = vigress8 <[email protected]>
 	repology = project: boehm-gc
-	source = https://github.com/ivmai/bdwgc/releases/download/v8.2.6/gc-8.2.6.tar.gz
-	source = https://github.com/lix-project/lix/raw/7dfa2a761ef8856454d8f63eda27edb8984bdc98/boehmgc-coroutine-sp-fallback.diff
-	sha256sums = b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc
+	source = https://github.com/ivmai/bdwgc/releases/download/v8.2.8/gc-8.2.8.tar.gz
+	source = https://github.com/NixOS/nixpkgs/raw/cc54a7243aa4b7bf87afc351885e1b9e42b32202/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch
+	sha256sums = 7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160
 	sha256sums = ddf3d3948262ae023e30491f6db437506e421633739a0e81da7f68f0a454fb13
 
 pkgname = libgc-nix

packages/libgc-nix/libgc-nix.pacscript

@@ -1,30 +1,35 @@
 pkgname='libgc-nix'
-arch=("any")
-pkgver='8.2.6'
+arch=('any')
+pkgver='8.2.8'
+epoch=1
 pkgdesc='The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (patched for Nix)'
 url='https://www.hboehm.info/gc/'
-provides=('libgc1' 'libgc-dev')
+provides=("libgc1=${epoch}:${pkgver}" "libgc-dev=${epoch}:${pkgver}")
 replaces=("${provides[@]}")
 maintainer=('vigress8 <[email protected]>')
 repology=('project: boehm-gc')
 makedepends=('pkg-config')
-patchrev='7dfa2a761ef8856454d8f63eda27edb8984bdc98'
+patchrev='cc54a7243aa4b7bf87afc351885e1b9e42b32202'
 source=(
   "https://github.com/ivmai/bdwgc/releases/download/v${pkgver}/gc-${pkgver}.tar.gz"
-  "https://github.com/lix-project/lix/raw/${patchrev}/boehmgc-coroutine-sp-fallback.diff"
+  "https://github.com/NixOS/nixpkgs/raw/${patchrev}/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch"
 )
 sha256sums=(
-  'b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc'
+  '7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160'
   'ddf3d3948262ae023e30491f6db437506e421633739a0e81da7f68f0a454fb13'
 )
 
 prepare() {
-  patch -d "gc-${pkgver}" -sp1 < boehmgc-coroutine-sp-fallback.diff
+  patch -d "gc-${pkgver}" -sp1 < boehmgc-coroutine-sp-fallback.patch
 }
 
 build() {
   cd "gc-${pkgver}"
-  ./configure --prefix=/usr --enable-cplusplus --disable-static
+  ./configure \
+    --disable-static \
+    --enable-cplusplus \
+    --enable-large-config \
+    --prefix=/usr
   make -j"${NCPU}"
 }
 

packages/lix-git/.SRCINFO

@@ -1,38 +1,31 @@
 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
 	arch = any
 	depends = busybox-static
-	depends = curl
 	depends = libarchive13t64 | libarchive13
 	depends = libboost-container1.83.0 | libboost-container1.81.0
-	depends = libboost-context1.83.0 | libboost-context1.81.0
-	depends = libboost-coroutine1.83.0 | libboost-coroutine1.81.0
 	depends = libbrotli1
 	depends = libbsd0
+	depends = libcapnp-1.0.1 | libcapnp-0.9.2 | libcapnp-0.9.1 | libcapnp-0.7.0
 	depends = libcurl4t64 | libcurl4
 	depends = liblowdown1
 	depends = libseccomp2
 	depends = libsodium26 | libsodium23
 	depends = libsqlite3-0
 	depends = libssl3t64 | libssl3
-	depends = perl
-	depends = xz-utils
-	makedepends = bison
 	makedepends = busybox-static
 	makedepends = cargo
+	makedepends = clang
 	makedepends = cmake
-	makedepends = doxygen
-	makedepends = flex
 	makedepends = graphviz
 	makedepends = libarchive-dev
 	makedepends = libboost-container-dev
-	makedepends = libboost-context-dev
-	makedepends = libboost-coroutine-dev
 	makedepends = libbrotli-dev
 	makedepends = libbsd-dev
+	makedepends = libcapnp-dev
 	makedepends = libcurl-dev
 	makedepends = liblowdown-dev
 	makedepends = librapidcheck-dev
@@ -43,13 +36,13 @@ 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
-	pacdeps = coreutils-single
-	pacdeps = libeditline-troglobit
+	makedepends = tao-pegtl-dev
+	pacdeps = libeditline-troglobit-git
 	pacdeps = libgc-nix
 	pacdeps = mdbook
 	pacdeps = mdbook-linkcheck
@@ -58,6 +51,6 @@ pkgbase = lix-git
 	conflicts = nix-setup-systemd
 	maintainer = vigress8 <[email protected]>
 	repology = project: lix-nix
-	source = lix::https://github.com/lix-project/lix.git
+	source = https://github.com/lix-project/lix.git
 
 pkgname = lix-git

packages/lix-git/lix-git.pacscript

@@ -1,29 +1,26 @@
 pkgname='lix-git'
 gives='lix'
-arch=("any")
-pkgver='2.90'
+arch=('any')
+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')
+source=('https://github.com/lix-project/lix.git')
 maintainer=('vigress8 <[email protected]>')
 repology=('project: lix-nix')
 conflicts=('lix' 'nix-bin' 'nix-setup-systemd')
 external_connection='true'
 makedepends_amd64=('libcpuid-dev')
 makedepends=(
-  'bison'
   'busybox-static'
   'cargo'
+  'clang'
   'cmake'
-  'doxygen'
-  'flex'
   'graphviz'
   'libarchive-dev'
   'libboost-container-dev'
-  'libboost-context-dev'
-  'libboost-coroutine-dev'
   'libbrotli-dev'
   'libbsd-dev'
+  'libcapnp-dev'
   'libcurl-dev'
   'liblowdown-dev'
   'librapidcheck-dev'
@@ -34,82 +31,75 @@ 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=(
   'busybox-static'
-  'curl'
   'libarchive13t64 | libarchive13'
   'libboost-container1.83.0 | libboost-container1.81.0'
-  'libboost-context1.83.0 | libboost-context1.81.0'
-  'libboost-coroutine1.83.0 | libboost-coroutine1.81.0'
   'libbrotli1'
   'libbsd0'
+  'libcapnp-1.0.1 | libcapnp-0.9.2 | libcapnp-0.9.1 | libcapnp-0.7.0'
   'libcurl4t64 | libcurl4'
   'liblowdown1'
   'libseccomp2'
   'libsodium26 | libsodium23'
   'libsqlite3-0'
   'libssl3t64 | libssl3'
-  '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'
+#  'python3-pytest'
+#  'python3-pytest-xdist'
 #)
 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
     -Denable-tests=false
     -Dgc=enabled
+    -Dinternal-api-docs=disabled
     -Dprefix=/usr
     -Dsandbox-shell=busybox
-    -Dstate-dir=/nix/var
-    -Dstore-dir=/nix/store
+    -Dseccomp-sandboxing=enabled
     -Dsysconfdir=/etc
     #-Dtests-brief=true
   )
   meson setup build "${mesonflags[@]}"
-  ninja -j"${NCPU}" -C build
+  meson compile -C build
 }
 
 #check() {
 #  cd lix
-#  ninja test -j"${NCPU}" -C build
+#  meson test -C build
 #}
 
 package() {
   cd lix
-  DESTDIR="${pkgdir}" ninja install -C build
+  meson install -C build --destdir "${pkgdir}"
 }