Skip to content

Commit

Permalink
upd(lix-git): 2.90 -> 2.92.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vigress8 committed Aug 29, 2024
1 parent c97f44a commit e543e30
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 49 deletions.
2 changes: 1 addition & 1 deletion packagelist
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ libcamera-git
libcutefish-git
libdisplay-info-git
libdrm
libeditline-troglobit
libeditline-troglobit-git
libfdk-aac1-deb
libgc-nix
libicu-deb
Expand Down
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -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}"
}
10 changes: 6 additions & 4 deletions packages/lix-git/.SRCINFO
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -47,8 +45,12 @@ pkgbase = lix-git
makedepends = nlohmann-json3-dev
makedepends = pkg-config
makedepends = python3
makedepends = tao-pegtl-dev
checkdepends = libgmock-dev
checkdepends = libgtest-dev
checkdepends = librapidcheck-dev
pacdeps = coreutils-single
pacdeps = libeditline-troglobit
pacdeps = libeditline-troglobit-git
pacdeps = libgc-nix
pacdeps = mdbook
pacdeps = mdbook-linkcheck
Expand Down
43 changes: 16 additions & 27 deletions packages/lix-git/lix-git.pacscript
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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'
Expand All @@ -38,6 +36,7 @@ makedepends=(
'nlohmann-json3-dev'
'pkg-config'
'python3'
'tao-pegtl-dev'
)
depends_amd64=('libcpuid16')
depends=(
Expand All @@ -58,57 +57,47 @@ depends=(
'perl'
'xz-utils'
)
#checkdepends=(
# 'libgmock-dev'
# 'libgtest-dev'
# 'librapidcheck-dev'
#)
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
-Denable-tests=false
-Dgc=enabled
-Dprefix=/usr
-Dsandbox-shell=busybox
-Dstate-dir=/nix/var
-Dstore-dir=/nix/store
-Dsysconfdir=/etc
#-Dtests-brief=true
-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
#}
check() {
cd lix
meson test -C build
}

package() {
cd lix
DESTDIR="${pkgdir}" ninja install -C build
DESTDIR="${pkgdir}" meson install -C build
}
17 changes: 10 additions & 7 deletions srclist
Original file line number Diff line number Diff line change
Expand Up @@ -5100,7 +5100,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/
Expand All @@ -5109,9 +5110,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
Expand Down Expand Up @@ -5622,7 +5623,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
Expand All @@ -5641,12 +5642,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
Expand All @@ -5669,8 +5668,12 @@ pkgbase = lix-git
makedepends = nlohmann-json3-dev
makedepends = pkg-config
makedepends = python3
makedepends = tao-pegtl-dev
checkdepends = libgmock-dev
checkdepends = libgtest-dev
checkdepends = librapidcheck-dev
pacdeps = coreutils-single
pacdeps = libeditline-troglobit
pacdeps = libeditline-troglobit-git
pacdeps = libgc-nix
pacdeps = mdbook
pacdeps = mdbook-linkcheck
Expand Down

0 comments on commit e543e30

Please sign in to comment.