From 0ce08368c4d7c509a984042b7e76af02b9362ce9 Mon Sep 17 00:00:00 2001 From: jake Date: Fri, 16 Jan 2026 09:52:43 -0800 Subject: [PATCH 1/2] testing pkgmgr --- packages/age/build.ncl | 4 +-- packages/btop/build.ncl | 4 +-- packages/btop/build.sh | 2 +- packages/clipper2/build.ncl | 4 +-- packages/difftastic/build.ncl | 4 +-- packages/htop/build.ncl | 54 +++++++++++++++++++++++++++++++++++ packages/htop/build.sh | 17 +++++++++++ packages/hwdata/build.ncl | 4 +-- packages/llama.cpp/build.ncl | 4 +-- packages/openblas/build.ncl | 4 +-- packages/prek/build.ncl | 4 +-- packages/skopeo/build.ncl | 4 +-- packages/tmux/build.ncl | 4 +-- packages/yazi/build.ncl | 4 +-- 14 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 packages/htop/build.ncl create mode 100755 packages/htop/build.sh diff --git a/packages/age/build.ncl b/packages/age/build.ncl index 67f41f78c..e9254f691 100644 --- a/packages/age/build.ncl +++ b/packages/age/build.ncl @@ -6,14 +6,14 @@ let toolchain = import "../toolchain/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "1.2.1" in +let version = "1.3.1" in { name = "age", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/FiloSottile/age/archive/refs/tags/v%{version}.tar.gz", - sha256 = "93bd89a16c74949ee7c69ef580d8e4cf5ce03e7d9c461b68cf1ace3e4017eef5", + sha256 = "396007bc0bc53de253391493bda1252757ba63af1a19db86cfb60a35cb9d290a", extract = true, strip_prefix = "age-%{version}", } | Source, diff --git a/packages/btop/build.ncl b/packages/btop/build.ncl index 18a3a3ec9..8be5600e8 100644 --- a/packages/btop/build.ncl +++ b/packages/btop/build.ncl @@ -4,14 +4,14 @@ let make = import "../make/build.ncl" in let toolchain = import "../toolchain/build.ncl" in let ncurses = import "../ncurses/build.ncl" in -let version = "1.4.5" in +let version = "1.4.6" in { name = "btop", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/aristocratos/btop/archive/refs/tags/v%{version}.tar.gz", - sha256 = "0ffe03d3e26a3e9bbfd5375adf34934137757994f297d6b699a46edd43c3fc02", + sha256 = "4beb90172c6acaac08c1b4a5112fb616772e214a7ef992bcbd461453295a58be", extract = true, } | Source, base, diff --git a/packages/btop/build.sh b/packages/btop/build.sh index bbe69499f..b7e7f82b9 100755 --- a/packages/btop/build.sh +++ b/packages/btop/build.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -cd btop-1.4.5 +cd btop-1.4.6 # Disable GPU paths at compile time make -j"$(nproc)" GPU_SUPPORT=false diff --git a/packages/clipper2/build.ncl b/packages/clipper2/build.ncl index 7ddd608ab..dc69eaf46 100644 --- a/packages/clipper2/build.ncl +++ b/packages/clipper2/build.ncl @@ -8,14 +8,14 @@ let ninja = import "../ninja/build.ncl" in let glibc = import "../glibc/build.ncl" in let gcc = import "../gcc/build.ncl" in -let version = "1.5.4" in +let version = "2.0.1" in { name = "clipper2", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/AngusJohnson/Clipper2/archive/refs/tags/Clipper2_%{version}.tar.gz", - sha256 = "9d8a35a29d04cd1b7b45f542c0ba48015feece1210036ea9e4efaad3140af4b0", + sha256 = "2a3693aceab4aed3e39b743e038d87701acc53cf05ed7b2013aab3e0aec5287e", extract = true, strip_prefix = "Clipper2-Clipper2_%{version}", } | Source, diff --git a/packages/difftastic/build.ncl b/packages/difftastic/build.ncl index 4a9066015..ae4feaf25 100644 --- a/packages/difftastic/build.ncl +++ b/packages/difftastic/build.ncl @@ -7,14 +7,14 @@ let toolchain = import "../toolchain/build.ncl" in let gcc = import "../gcc/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "0.65.0" in +let version = "0.67.0" in { name = "difftastic", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/Wilfred/difftastic/archive/refs/tags/%{version}.tar.gz", - sha256 = "59462f69e2cedfdc1bee4fd0da48fe9a7ae635cdb6818c1a300b31c0b146d4b8", + sha256 = "a6a15d6ca9f9ab7c034d1770417d1829deb3fbe9dcf4731b9cba867e50e78437", extract = true, strip_prefix = "difftastic-%{version}", } | Source, diff --git a/packages/htop/build.ncl b/packages/htop/build.ncl new file mode 100644 index 000000000..ee9422b03 --- /dev/null +++ b/packages/htop/build.ncl @@ -0,0 +1,54 @@ +let { Attrs, BuildSpec, Local, OutputBin, OutputData, Source, .. } = import "minimal.ncl" in +let base = import "../base/build.ncl" in +let toolchain = import "../toolchain/build.ncl" in +let make = import "../make/build.ncl" in +let autoconf = import "../autoconf/build.ncl" in +let automake = import "../automake/build.ncl" in +let pkgconf = import "../pkgconf/build.ncl" in +let perl = import "../perl/build.ncl" in +let m4 = import "../m4/build.ncl" in + +let ncurses = import "../ncurses/build.ncl" in +let glibc = import "../glibc/build.ncl" in + +let version = "3.4.1" in +{ + name = "htop", + inputs = [ + { file = "build.sh" } | Local, + { + url = "https://github.com/htop-dev/htop/archive/refs/tags/%{version}.tar.gz", + sha256 = "af9ec878f831b7c27d33e775c668ec79d569aa781861c995a0fbadc1bdb666cf", + extract = true, + strip_prefix = "htop-%{version}", + } | Source, + base, + toolchain, + make, + autoconf, + automake, + pkgconf, + perl, + m4, + ], + runtime_deps = [ + ncurses, + glibc, + ], + + cmd = "./build.sh", + + outputs = { + bins = { glob = "usr/bin/htop" } | OutputBin, + + desktop = { glob = "usr/share/applications/*.desktop" } | OutputData, + icons = { glob = "usr/share/icons/**" } | OutputData, + pixmaps = { glob = "usr/share/pixmaps/*" } | OutputData, + mans = { glob = "usr/share/man/**" } | OutputData, + }, + + attrs = + { + upstream_version = version, + } | Attrs, +} | BuildSpec diff --git a/packages/htop/build.sh b/packages/htop/build.sh new file mode 100755 index 000000000..dba9a94c7 --- /dev/null +++ b/packages/htop/build.sh @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +# Generate configure script +autoreconf -fi + +# Configure with ncurses support +./configure \ + --prefix=/usr \ + --disable-static \ + --enable-unicode + +# Build +make -j$(nproc) + +# Install +make DESTDIR="$OUTPUT_DIR" install diff --git a/packages/hwdata/build.ncl b/packages/hwdata/build.ncl index 7f2a0540d..dd6a212ad 100644 --- a/packages/hwdata/build.ncl +++ b/packages/hwdata/build.ncl @@ -3,14 +3,14 @@ let base = import "../base/build.ncl" in let make = import "../make/build.ncl" in let toolchain = import "../toolchain/build.ncl" in -let version = "0.402" in +let version = "0.403" in { name = "hwdata", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/vcrhonek/hwdata/archive/refs/tags/v%{version}.tar.gz", - sha256 = "e390fe2f5f5ef7ed9ccbe62eb7cd40d4ee2b57389e7869c0dc96433c81812e7a", + sha256 = "77d0a69e5558d16d33bbb510a09093deaf11c882baf9ef6ec5f18a8ef96e2c13", extract = true, strip_prefix = "hwdata-%{version}", } | Source, diff --git a/packages/llama.cpp/build.ncl b/packages/llama.cpp/build.ncl index 9aa9edf8c..f8b9a8792 100644 --- a/packages/llama.cpp/build.ncl +++ b/packages/llama.cpp/build.ncl @@ -8,14 +8,14 @@ let hwdata = import "../hwdata/build.ncl" in let pciutils = import "../pciutils/build.ncl" in let toolchain = import "../toolchain/build.ncl" in -let version = "b7499" in +let version = "b7757" in { name = "llama.cpp", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/ggml-org/llama.cpp/archive/refs/tags/%{version}.tar.gz", - sha256 = "dd08c9028dd7323554acb3755aa2ff65bd3556b35e4bd780d5cf01ada9824dcc", + sha256 = "1f7fd9907accd421d8a96edf067eab13206a80e4a9755d0e18aca5452f0bd231", extract = true, strip_prefix = "llama.cpp-%{version}", } | Source, diff --git a/packages/openblas/build.ncl b/packages/openblas/build.ncl index d7a205302..343fb258d 100644 --- a/packages/openblas/build.ncl +++ b/packages/openblas/build.ncl @@ -6,14 +6,14 @@ let make = import "../make/build.ncl" in let glibc = import "../glibc/build.ncl" in # TODO: Needs fortran compiler for LAPACK to properly work. -let version = "0.3.30" in +let version = "0.3.31" in { name = "openblas", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/OpenMathLib/OpenBLAS/archive/refs/tags/v%{version}.tar.gz", - sha256 = "27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d", + sha256 = "6dd2a63ac9d32643b7cc636eab57bf4e57d0ed1fff926dfbc5d3d97f2d2be3a6", extract = true, strip_prefix = "OpenBLAS-%{version}", } | Source, diff --git a/packages/prek/build.ncl b/packages/prek/build.ncl index ab6cbd78a..93bebb947 100644 --- a/packages/prek/build.ncl +++ b/packages/prek/build.ncl @@ -6,14 +6,14 @@ let toolchain = import "../toolchain/build.ncl" in let gcc = import "../gcc/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "0.2.25" in +let version = "0.2.29" in { name = "prek", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/j178/prek/archive/refs/tags/v%{version}.tar.gz", - sha256 = "0b8e342fc2ffba1d69a3d2bf35f575b0c7bb8404ad2bdf981ca502175ec9d092", + sha256 = "812ae513cadeb8825e80bfc42771f3a55e75b12267bb1f1bb9f80737dfcb6c47", extract = true, strip_prefix = "prek-%{version}", } | Source, diff --git a/packages/skopeo/build.ncl b/packages/skopeo/build.ncl index 540d76780..f6f31750d 100644 --- a/packages/skopeo/build.ncl +++ b/packages/skopeo/build.ncl @@ -7,14 +7,14 @@ let toolchain = import "../toolchain/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "1.20.0" in +let version = "1.21.0" in { name = "skopeo", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/containers/skopeo/archive/refs/tags/v%{version}.tar.gz", - sha256 = "0c19fe51b2cd8d1bd5e38c03b97421e318fc08153bdf5ef2f816a29889eacdef", + sha256 = "f76eeddf697a3cc7a872e3077ab4d0fdbebe9f3c6171462e3e9feb84368b3fac", extract = true, strip_prefix = "skopeo-%{version}", } | Source, diff --git a/packages/tmux/build.ncl b/packages/tmux/build.ncl index efd24073e..39be6284d 100644 --- a/packages/tmux/build.ncl +++ b/packages/tmux/build.ncl @@ -13,14 +13,14 @@ let ncurses = import "../ncurses/build.ncl" in let libevent = import "../libevent/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "3.5a" in +let version = "3.6a" in { name = "tmux", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/tmux/tmux/archive/refs/tags/%{version}.tar.gz", - sha256 = "49e68b41dec0bf408990160ee12fa29b06dee8f74c1f0b4b71c9d2a1477dd910", + sha256 = "cd8d97f344cd2faa89e41358428b3ada883e4c72fd7d4f43ccac93daec1442eb", extract = true, strip_prefix = "tmux-%{version}", } | Source, diff --git a/packages/yazi/build.ncl b/packages/yazi/build.ncl index 285051277..4128506c0 100644 --- a/packages/yazi/build.ncl +++ b/packages/yazi/build.ncl @@ -7,14 +7,14 @@ let toolchain = import "../toolchain/build.ncl" in let gcc = import "../gcc/build.ncl" in let glibc = import "../glibc/build.ncl" in -let version = "25.5.31" in +let version = "26.1.4" in { name = "yazi", inputs = [ { file = "build.sh" } | Local, { url = "https://github.com/sxyazi/yazi/archive/refs/tags/v%{version}.tar.gz", - sha256 = "4d005e7c3f32b5574d51ab105597f3da3a4be2f7b5cd1bcb284143ad38253ed4", + sha256 = "17839410a2865dc6ddb40da4b034dbf2729602fc325d07ad4df7dbc354c94c9e", extract = true, strip_prefix = "yazi-%{version}", } | Source, From 3bc34547c01826cb6eb0d7f5fccc51fae2daffc0 Mon Sep 17 00:00:00 2001 From: jake Date: Fri, 16 Jan 2026 10:23:31 -0800 Subject: [PATCH 2/2] Fix llama.cpp build.sh --- packages/llama.cpp/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/llama.cpp/build.sh b/packages/llama.cpp/build.sh index 42b73f8bd..7980eac4e 100755 --- a/packages/llama.cpp/build.sh +++ b/packages/llama.cpp/build.sh @@ -7,4 +7,4 @@ cmake --build build --config Release -j $(nproc) mkdir -pv $OUTPUT_DIR/usr/{bin,lib} install -vm755 build/bin/*.so $OUTPUT_DIR/usr/lib/ -install -vm755 build/bin/llama-{cli,run,server} $OUTPUT_DIR/usr/bin/ +install -vm755 build/bin/llama-{cli,server} $OUTPUT_DIR/usr/bin/