Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-08-22 06:07:12 +00:00
committed by GitHub
32 changed files with 982 additions and 870 deletions

View File

@@ -361,7 +361,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/applications/editors/kakoune @philiptaron
# LuaPackages
/pkgs/development/interpreters/lua-5 @NixOS/lua
/pkgs/development/interpreters/luajit @NixOS/lua
/pkgs/development/lua-modules @NixOS/lua
/pkgs/top-level/lua-packages.nix @NixOS/lua
# Neovim
/pkgs/applications/editors/neovim @NixOS/neovim

View File

@@ -92,8 +92,8 @@ rec {
thunderbird-153 = common {
applicationName = "Thunderbird ESR";
version = "153.0.1esr";
sha512 = "3773b49b69341aea108a627faa0dd5b7cfb52cdb4c37e625fbb8cbaef7f9166f925ecbc199173302d5bef7994e6bff3b56cd56a3a4c38a9d702cc3e5aeafcf7c";
version = "153.1.0esr";
sha512 = "3d6c82e1489b906e6cf73c3eeb7d7e23de6901a75c704176b996d183a889f24275214999155992789a57a713e6cd073e2752120c3b281136ed34f36f289fbcb4";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-153";

View File

@@ -24,13 +24,13 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.38.1";
version = "2.39.0";
sources = {
aarch64-linux = fetch "linux_arm64" "sha256-RmpJkrrLrKwbmbw50+sTg0aFa0+M2EFPZ6+QSc3aV5M=" "zip";
i686-linux = fetch "linux_386" "sha256-hnpVsbNgofmfw/XobVZ2MnbGIcAjxH1MvVJNc5T1kuk=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-k268YiTC/2MJZhVqMI/e9bsrf4Sr4Wj8M/h/hbmmcqY=" "zip";
aarch64-linux = fetch "linux_arm64" "sha256-2/Nb2EGgzOcOfDGQ6Znfxynql3sGVZFYWhcE/51/kBY=" "zip";
i686-linux = fetch "linux_386" "sha256-6mmjsWsSDR8Ta+KJGXGcaIfUXUlspElIwBUpfLtDTsk=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-i2lzaEoJP/Re3DJvTgHNwZ9UXXxHKd6UIF3CmASt2N8=" "zip";
aarch64-darwin =
fetch "apple_universal" "sha256-pLlEsqCL5j9QCuLkQxK/Mmz647lKbCYhOUiPch2MMuE="
fetch "apple_universal" "sha256-veJhRo8yMkhOJzjjN+OcZ0wRpFN/TG7TFPkz6uVYpAU="
"pkg";
};
platforms = builtins.attrNames sources;

View File

@@ -15,7 +15,7 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "borgmatic";
version = "2.1.6";
version = "2.1.7";
pyproject = true;
strictDeps = true;
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-Mgx8PnGfTa5j6+53RVntPHa5EDJAY2NQC3fvmyRj24Y=";
hash = "sha256-qsB8564wCWBemsxn7vIBmntdabzK1j7agP8ZK2nzdc8=";
};
passthru.updateScript = nix-update-script { };

View File

@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "dolt";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
tag = "v${finalAttrs.version}";
hash = "sha256-ho0mUdiwYTmczU7791pyD3MpCMje2a/IVt40QIiCJd4=";
hash = "sha256-KwN0na1G2M9hnPQqraRF8UhU8P3efv6DYXj3WEBCBDA=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-k5fpdI1wtZQYpjJEyre3Kh57AC0i3PsU2SIsf8ga1c8=";
vendorHash = "sha256-28lZ8rL/X/Lgxi1kwg62Wk97M/lEFqhllUAmnq8v54c=";
proxyVendor = true;
doCheck = false;

View File

@@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "lenovo-legion-app";
version = "0.0.21-unstable-2026-08-07";
version = "0.0.22-unstable-2026-08-21";
pyproject = true;
src = fetchFromGitHub {
owner = "johnfanv2";
repo = "LenovoLegionLinux";
rev = "2b5d6b4c9a3f3ea2702c38c9b1040c8d5d0a8e67";
hash = "sha256-T9h95N0sJPxtGI03qbuCgolH0cQely90ZO7Aeq+kIHg=";
rev = "2539d5923076bebaee7db014930b22a666a1c5e9";
hash = "sha256-BbmPOwsQ/S+UQWI9103jDDunHA67xTJgpV+afQZDpH4=";
};
sourceRoot = "${src.name}/python/legion_linux";

View File

@@ -64,14 +64,14 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "liteparse";
version = "2.11.1";
version = "2.13.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "run-llama";
repo = "liteparse";
tag = "crates-v${finalAttrs.version}";
hash = "sha256-F2zajjX55EWpJaH/W1I5ZO7Fi11zdRrX1QsPk1T4h6E=";
hash = "sha256-owKu03Gxou53hQbU9O+UniJTCxtGKshgO11sF6DNudI=";
};
postPatch = ''
@@ -106,7 +106,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
tesseract
];
cargoHash = "sha256-21t92uT5wzIxFpyFH85dBo0T5BKu6jlaXdObLGYF9i0=";
cargoHash = "sha256-rb/3L/SJqe1qKOIe33IfhORcFRtaJmB8TN70sdxhXkc=";
cargoBuildFlags = [
"--package"
"liteparse"

View File

@@ -0,0 +1,48 @@
{
pname,
version,
meta,
lib,
fetchurl,
stdenvNoCC,
# nativeBuildInputs
makeBinaryWrapper,
undmg,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname version;
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${finalAttrs.version}/LocalSend-${finalAttrs.version}.dmg";
hash = "sha256-k6uITCcDoPq9cmEQl7JhbA3vhsQlbOoq3XoP823Xazo=";
};
nativeBuildInputs = [
makeBinaryWrapper
undmg
];
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r LocalSend.app $out/Applications
makeWrapper $out/Applications/LocalSend.app/Contents/MacOS/LocalSend $out/bin/localsend
runHook postInstall
'';
meta = meta // {
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
mainProgram = "localsend";
platforms = [ "aarch64-darwin" ];
};
})

View File

@@ -0,0 +1,126 @@
{
pname,
version,
meta,
lib,
fetchFromGitHub,
flutter341,
replaceVars,
rustPlatform,
stdenvNoCC,
# nativeBuildInputs
copyDesktopItems,
makeDesktopItem,
# buildInputs
libayatana-appindicator,
# passthru
nixosTests,
}:
flutter341.buildFlutterApplication (finalAttrs: {
inherit pname version;
strictDeps = true;
src = fetchFromGitHub {
owner = "localsend";
repo = "localsend";
tag = "v${finalAttrs.version}";
hash = "sha256-AmQVXGMVKLTOZ0HMi05ba/y4TmB56NlNvtGaKYvqt4o=";
};
sourceRoot = "${finalAttrs.src.name}/app";
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
device_apps = "sha256-oreTBOYh4J2N4HhY2gxNwwxfl1OSAZRH1GOeVrH8LG8=";
pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o=";
permission_handler_windows = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
};
postPatch = ''
substituteInPlace lib/util/native/autostart_helper.dart \
--replace-fail 'Exec=''${Platform.resolvedExecutable}' "Exec=localsend_app"
'';
nativeBuildInputs = [ copyDesktopItems ];
buildInputs = [ libayatana-appindicator ];
customSourceBuilders.rust_lib_localsend_app =
{ version, src, ... }:
stdenvNoCC.mkDerivation (finalAttrs': {
pname = "rust_lib_localsend_app";
inherit version src;
inherit (src) passthru;
postPatch = ''
pushd ${finalAttrs'.src.passthru.packageRoot}
patch -p1 <${
replaceVars ./no-cargokit.patch {
inherit (finalAttrs.passthru) rustLib;
}
}
popd
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
});
postInstall = ''
for s in 32 128 256 512; do
d=$out/share/icons/hicolor/''${s}x''${s}/apps
mkdir -p $d
cp assets/img/logo-''${s}.png $d/localsend.png
done
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/localsend/lib
'';
desktopItems = [
(makeDesktopItem {
name = "LocalSend";
exec = "localsend_app %U";
icon = "localsend";
desktopName = "LocalSend";
startupWMClass = "localsend_app";
genericName = "An open source cross-platform alternative to AirDrop";
categories = [
"GTK"
"FileTransfer"
"Utility"
];
keywords = [
"Sharing"
"LAN"
"Files"
];
startupNotify = true;
})
];
passthru = {
rustLib = rustPlatform.buildRustPackage {
pname = "${finalAttrs.pname}-rust-lib";
inherit (finalAttrs) version src;
cargoHash = "sha256-mdyWYfzS6YieY+dwQXREZJDo4PEKO5W9C3A3XGWoDKI=";
buildAndTestSubdir = "packages/localsend_isolates/rust";
};
tests = { inherit (nixosTests) localsend; };
};
meta = meta // {
mainProgram = "localsend_app";
platforms = lib.platforms.linux;
};
})

View File

@@ -0,0 +1,17 @@
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -7,13 +7,10 @@
set(PROJECT_NAME "rust_lib_localsend_app")
project(${PROJECT_NAME} LANGUAGES CXX)
-include("../cargokit/cmake/cargokit.cmake")
-apply_cargokit(${PROJECT_NAME} ../../rust rust_lib_localsend_app "")
-
# List of absolute paths to libraries that should be bundled with the plugin.
# This list could contain prebuilt libraries, or libraries created by an
# external build triggered from this build file.
set(rust_lib_localsend_app_bundled_libraries
- "${${PROJECT_NAME}_cargokit_lib}"
+ "@rustLib@/lib/librust_lib_localsend_app.so"
PARENT_SCOPE
)

View File

@@ -1,152 +1,77 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
flutter329,
makeDesktopItem,
copyDesktopItems,
nixosTests,
libayatana-appindicator,
undmg,
makeBinaryWrapper,
fetchpatch,
}:
fetchurl,
flutter341,
replaceVars,
rustPlatform,
stdenvNoCC,
# nativeBuildInputs
copyDesktopItems,
makeBinaryWrapper,
makeDesktopItem,
undmg,
# buildInputs
libayatana-appindicator,
# passthru
nixosTests,
}:
let
pname = "localsend";
version = "1.17.0";
version = "1.18.0";
linux = flutter329.buildFlutterApplication rec {
inherit pname version;
src = fetchFromGitHub {
owner = "localsend";
repo = "localsend";
tag = "v${version}";
hash = "sha256-1xMzlIcGEJ58laSM48bCKMxzHQ36eUHD5Mac0O1dnXk=";
};
sourceRoot = "${src.name}/app";
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
permission_handler_windows = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o=";
};
patches = [
# Fix for https://github.com/localsend/localsend/security/advisories/GHSA-34v6-52hh-x4r4
# See: https://github.com/NixOS/nixpkgs/issues/488755
# Can be removed with new release > 1.17.0
(fetchpatch {
url = "https://github.com/localsend/localsend/commit/8f3cec85aa29b2b13fed9b2f8e499e1ac9b0504c.patch";
hash = "sha256-Fswir+TebCDPxHVBg8YM3ROx2uoLG92E3E15wnzHz+U=";
})
];
patchFlags = [ "-p2" ];
postPatch = ''
substituteInPlace lib/util/native/autostart_helper.dart \
--replace-fail 'Exec=''${Platform.resolvedExecutable}' "Exec=localsend_app"
'';
nativeBuildInputs = [
copyDesktopItems
];
buildInputs = [ libayatana-appindicator ];
postInstall = ''
for s in 32 128 256 512; do
d=$out/share/icons/hicolor/''${s}x''${s}/apps
mkdir -p $d
cp ./assets/img/logo-''${s}.png $d/localsend.png
done
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/localsend/lib
'';
desktopItems = [
(makeDesktopItem {
name = "LocalSend";
exec = "localsend_app %U";
icon = "localsend";
desktopName = "LocalSend";
startupWMClass = "localsend_app";
genericName = "An open source cross-platform alternative to AirDrop";
categories = [
"GTK"
"FileTransfer"
"Utility"
];
keywords = [
"Sharing"
"LAN"
"Files"
];
startupNotify = true;
})
];
passthru = {
updateScript = ./update.sh;
tests.localsend = nixosTests.localsend;
};
meta = metaCommon // {
mainProgram = "localsend_app";
};
};
darwin = stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
hash = "sha256-/fGkLuE+uf3WrpTcWIOYHooJWZ51i94j9uZ3xPq1yTw=";
};
nativeBuildInputs = [
undmg
makeBinaryWrapper
];
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r LocalSend.app $out/Applications
makeBinaryWrapper $out/Applications/LocalSend.app/Contents/MacOS/LocalSend $out/bin/localsend
runHook postInstall
'';
meta = metaCommon // {
mainProgram = "localsend";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [
"aarch64-darwin"
];
};
};
metaCommon = {
meta = {
description = "Open source cross-platform alternative to AirDrop";
homepage = "https://localsend.org/";
donationPage = "https://localsend.org/donate";
license = lib.licenses.mit;
downloadPage = "https://github.com/localsend/localsend/releases";
changelog = "https://github.com/localsend/localsend/blob/HEAD/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
sikmir
linsui
pandapip1
prince213
];
};
in
if stdenv.hostPlatform.isDarwin then darwin else linux
if stdenvNoCC.hostPlatform.isDarwin then
import ./darwin.nix {
inherit
pname
version
meta
lib
fetchurl
stdenvNoCC
makeBinaryWrapper
undmg
;
}
else
import ./linux.nix {
inherit
pname
version
meta
lib
fetchFromGitHub
flutter341
replaceVars
rustPlatform
stdenvNoCC
copyDesktopItems
makeDesktopItem
libayatana-appindicator
nixosTests
;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,26 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestVersion=$(curl --fail --silent https://api.github.com/repos/localsend/localsend/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; localsend.version or (lib.getVersion localsend)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/package.nix"
DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg"
DARWIN_X64_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL}))
sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/package.nix"
GIT_SRC_URL="https://github.com/localsend/localsend/archive/refs/tags/v${latestVersion}.tar.gz"
GIT_SRC_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --unpack ${GIT_SRC_URL}))
sed -i "/linux/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/package.nix"
curl https://raw.githubusercontent.com/localsend/localsend/v${latestVersion}/app/pubspec.lock | yq . > $ROOT/pubspec.lock.json

View File

@@ -7,22 +7,22 @@
}:
rustPlatform.buildRustPackage {
pname = "nufmt";
version = "0-unstable-2026-07-23";
version = "0-unstable-2026-08-12";
src = fetchFromGitHub {
owner = "nushell";
repo = "nufmt";
rev = "f4c2e3bfb9cfff0a430c513ad2198634412e22a1";
hash = "sha256-bElMaIou3kvYBCEwTAgdG8a7Ug2R7P6giwSHmdrtinI=";
rev = "7cfd3b7eacf5a9feb22777230e3076038f2e9e8d";
hash = "sha256-v490Rlrih2R1zyGlHbOWzOFn5UTNb6Wx3v7LKLxXahY=";
};
nativeBuildInputs = [
rustPlatform.bindgenHook
];
cargoHash = "sha256-MLfhuFjYv2Vi3BGJFzbmi+xhhm6M0a4oOe7wpHtfObc=";
cargoHash = "sha256-Fb2A9DcYCIdSWrFg4MqkZJ6ev4VQ/VwrBtZoJLEBOHc=";
# NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/f4c2e3bfb9cfff0a430c513ad2198634412e22a1
# NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/7cfd3b7eacf5a9feb22777230e3076038f2e9e8d
postPatch = ''
substituteInPlace tests/ground_truth.rs --replace-fail \
' let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \

View File

@@ -65,6 +65,7 @@ let
desktopItem = makeDesktopItem {
name = "obsidian";
desktopName = "Obsidian";
startupWMClass = "md.Obsidian";
comment = "Knowledge base";
icon = "obsidian";
exec = "obsidian %u";

View File

@@ -28,25 +28,25 @@ in
# runs without an external linter, which leaves `jsPlugins` configs inert.
stdenv.mkDerivation (finalAttrs: {
pname = "oxlint";
version = "1.78.0";
version = "1.79.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "oxc";
tag = "oxlint_v${finalAttrs.version}";
hash = "sha256-55IzeYx7Bfs40gvfyvbog+QKab5DoXNI1ydc/mcvQDQ=";
hash = "sha256-eF2iHhPiHONNFDufnv2KjLCaE3l/a07Imunz4vbzvcg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-mVk2thsSITIQ6vCQkxBlBvQpPRS0jpWoN+wZ3WJLoJw=";
hash = "sha256-X2eH2EMaD8cLh7DlPcg5TuOZ/a8oJ5HPtz3eMhJx4RI=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-buM8gRuxi9rrcUVYXHEOnjWpbD4godiNQHAXAUTP7C0=";
hash = "sha256-igiyjhUfQy5GW5fn3br0QNZzMiSDdrAxbj0gK6MSvm8=";
};
dontUseCmakeConfigure = true;

View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pineapple-pictures";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "BLumia";
repo = "pineapple-pictures";
rev = finalAttrs.version;
hash = "sha256-76DJsJLd7lZqear0FIarmTqL3mlqrrCdwxgXsYmDQNE=";
hash = "sha256-/RRbHPZ5c281ezSlrkvWo7510HpAphJs2eojSwjADiM=";
};
nativeBuildInputs = [

View File

@@ -1,6 +1,6 @@
{
version = "3.13.2";
hash = "sha256-82M1CACdTogsCKA6OK2spbkQ6W2DUP2ZDg3hc1q3ZQo=";
pnpmDepsHash = "sha256-Z1TYYZhELi+rIiuleN8xR/WiMn9TF4KotFMTOsR2e6Y=";
vendorHash = "sha256-d2pQl6SnPIVIgn1lYIpQbKeloWtYwDMLHnmqsLtHjoA=";
version = "3.14.0";
hash = "sha256-7PSfh+KWUpmL3BZ7INa1DOZ/ysaXXdWG9n/F+H0cGYo=";
pnpmDepsHash = "sha256-lmKUkeDdinb6WlnZSx3FnBlF/ACgUmvSMpYo84tRdCw=";
vendorHash = "sha256-sCgxO2/w3Bi6Ncs/Q+JVZVtQC448FEx3llYxe/UxWEE=";
}

View File

@@ -1,6 +1,6 @@
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
nodejs,
pnpm_10,
@@ -8,15 +8,15 @@
pnpmConfigHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tailwindcss-language-server";
version = "0.14.29";
version = "0.16.0";
src = fetchFromGitHub {
owner = "tailwindlabs";
repo = "tailwindcss-intellisense";
tag = "v${finalAttrs.version}";
hash = "sha256-o5NyU52j3ZyuKWT4lL5U78qz4TBbXerylTl2fdvwqlk=";
hash = "sha256-QMTzylHAO5s5VtyBAnHEoxKq8ndRyAdvh/N5xUYRLas=";
};
pnpmDeps = fetchPnpmDeps {
@@ -25,18 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
version
src
pnpmWorkspaces
patchPhase
;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-excPYLP+81ftU/LwBeO/lmj4Nbefb4dNvpvudg/sx+w=";
hash = "sha256-5e6fC+5BwQm9TqZlnZ9GiPlVwCdEePTpUh4m4tt8qy4=";
};
patchPhase = ''
substituteInPlace ./packages/tailwindcss-language-server/package.json \
--replace '"@tailwindcss/oxide": "^4.1.15",' '"@tailwindcss/oxide": "^4.1.14",'
'';
nativeBuildInputs = [
pnpmConfigHook
pnpm_10
@@ -51,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
];
# Must build the "@tailwindcss/language-service" package. Dependency is linked via workspace by "pnpm"
# https://github.com/tailwindlabs/tailwindcss-intellisense/blob/v0.14.24/pnpm-lock.yaml#L71
# https://github.com/tailwindlabs/tailwindcss-intellisense/blob/v0.16.0/pnpm-lock.yaml#L77
buildPhase = ''
runHook preBuild

View File

@@ -16,14 +16,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xfce4-dict";
version = "0.8.9";
version = "0.8.10";
src = fetchFromGitLab {
domain = "gitlab.xfce.org";
owner = "apps";
repo = "xfce4-dict";
tag = "xfce4-dict-${finalAttrs.version}";
hash = "sha256-cl5TnPlgGUZ4esdkptyXO+LagdAboSzR4m0cCre9RHA=";
hash = "sha256-d/D6qcW3k2YsLJo5kohTOHLShHjofmHcR1Qfwe3ZFIk=";
};
strictDeps = true;

View File

@@ -6,7 +6,7 @@
clangStdenv.mkDerivation (finalAttrs: {
pname = "yafetch";
version = "unstable-2022-04-20";
version = "0-unstable-2022-04-20";
src = fetchFromGitHub {
owner = "kira64xyz";

View File

@@ -1,43 +1,27 @@
{
_experimental-update-script-combinators,
erlang,
fetchFromGitHub,
fetchMixDeps,
gnused,
lib,
mixRelease,
nix-update-script,
nurl,
nix-update,
writeShellApplication,
}:
let
version = "0.1.8";
mixRelease (finalAttrs: {
pname = "expert";
version = "0.1.9";
src = fetchFromGitHub {
owner = "expert-lsp";
repo = "expert";
tag = "v${version}";
hash = "sha256-2dZ3ve1ksdI1atjA6mxipwPYOr0yEZeKWhteSfMeL48=";
tag = "v${finalAttrs.version}";
hash = "sha256-TcYSO+CY4ZC4uC6k5OhKFKwv70preoILHAan3KZlUqQ=";
};
engineDeps = fetchMixDeps {
pname = "mix-deps-expert-engine";
inherit src version;
hash = "sha256-evYg/yRk6ymV75kuWpY0pFODWWopozjnFHUa9MOFN/A=";
preConfigure = ''
cd apps/engine
'';
};
in
mixRelease rec {
pname = "expert";
inherit src version;
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version;
pname = "mix-deps-${finalAttrs.pname}";
inherit (finalAttrs) src version;
hash = "sha256-N2krs4NNWytrN3K8lR5IGGroXVNuBzjks6IoD9D1rPM=";
preConfigure = ''
@@ -47,8 +31,19 @@ mixRelease rec {
mixReleaseName = "plain";
engineDeps = fetchMixDeps {
pname = "mix-deps-expert-engine";
inherit (finalAttrs) src version;
hash = "sha256-evYg/yRk6ymV75kuWpY0pFODWWopozjnFHUa9MOFN/A=";
preConfigure = ''
cd apps/engine
'';
};
preConfigure = ''
ln -sv ${engineDeps} apps/engine/deps
ln -sv ${finalAttrs.engineDeps} apps/engine/deps
cd apps/expert
'';
@@ -62,30 +57,19 @@ mixRelease rec {
removeCookie = false;
passthru = {
inherit engineDeps;
updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script { })
(lib.getExe (writeShellApplication {
name = "expert-update-engine";
runtimeInputs = [
gnused
nurl
];
text = ''
nixpkgs="$(git rev-parse --show-toplevel)"
engineHashOld=${engineDeps.hash}
engineHashNew=$(nurl -e "(import $nixpkgs/. { }).$UPDATE_NIX_ATTR_PATH.engineDeps")
echo "$UPDATE_NIX_ATTR_PATH.engineDeps.hash" >&2
sed -i "s|$engineHashOld|$engineHashNew|" "$nixpkgs"/pkgs/development/beam-modules/expert/default.nix
'';
}))
];
updateScript = lib.getExe (writeShellApplication {
name = "expert-update-script";
runtimeInputs = [ nix-update ];
text = ''
nix-update beamPackages.expert
nix-update beamPackages.expert.engineDeps
'';
});
};
meta = {
homepage = "https://github.com/expert-lsp/expert";
changelog = "https://github.com/expert-lsp/expert/blob/v0.1.1/CHANGELOG.md";
changelog = "https://github.com/expert-lsp/expert/blob/v${finalAttrs.version}/CHANGELOG.md";
description = "Official Elixir Language Server Protocol implementation";
longDescription = ''
Expert is the official language server implementation for the Elixir programming language.
@@ -95,4 +79,4 @@ mixRelease rec {
mainProgram = "expert";
teams = [ lib.teams.beam ];
};
}
})

View File

@@ -8,7 +8,7 @@
buildPythonPackage (finalAttrs: {
pname = "caido-schema-proxy";
version = "0.57.1";
version = "0.58.0";
pyproject = true;
__structuredAttrs = true;
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
src = fetchPypi {
pname = "caido_schema_proxy";
inherit (finalAttrs) version;
hash = "sha256-gIElEhHnMDfz6hu0UTOtTiYaB/ZnfeBCskEWTM9419M=";
hash = "sha256-1vGmDivVqx3XN1CUR/XwgYTG/mwI6Zny0Nv8AKUpOa4=";
};
build-system = [ hatchling ];

View File

@@ -6,6 +6,7 @@
gql,
nix-update-script,
pydantic,
semver,
uv-build,
pytestCheckHook,
pytest-asyncio,
@@ -13,7 +14,7 @@
buildPythonPackage (finalAttrs: {
pname = "caido-sdk-client";
version = "0.2.0";
version = "0.3.1";
pyproject = true;
__structuredAttrs = true;
@@ -21,7 +22,7 @@ buildPythonPackage (finalAttrs: {
src = fetchPypi {
pname = "caido_sdk_client";
inherit (finalAttrs) version;
hash = "sha256-OZiP4Hs/qcaa29SWYttmDXcH1g2SRRCbFiPe+Xs5usg=";
hash = "sha256-9jvd49QePhboxtHDDyWcumliNLX8n2bfOjNjcZWLKDs=";
};
postPatch = ''
@@ -35,6 +36,7 @@ buildPythonPackage (finalAttrs: {
caido-server-auth
gql
pydantic
semver
]
++ gql.optional-dependencies.aiohttp
++ gql.optional-dependencies.websockets;

View File

@@ -2,8 +2,14 @@
lib,
stdenv,
buildPythonPackage,
common-updater-scripts,
curl,
fetchFromGitHub,
nix,
nix-update,
nanobind,
perl,
writeShellApplication,
# build-system
cmake,
@@ -31,7 +37,6 @@ let
gguf-tools = fetchFromGitHub {
owner = "antirez";
repo = "gguf-tools";
# Tag from https://github.com/ml-explore/mlx/blob/v0.31.1/mlx/io/CMakeLists.txt#L14
rev = "8fa6eb65236618e28fd7710a0fba565f7faa1848";
hash = "sha256-15FvyPOFqTOr5vdWQoPnZz+mYH919++EtghjozDlnSA=";
};
@@ -69,9 +74,6 @@ buildPythonPackage (finalAttrs: {
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
'';
# updates the wrong fetcher rev attribute
passthru.skipBulkUpdate = true;
env = {
PYPI_RELEASE = 1;
CMAKE_ARGS = toString [
@@ -146,24 +148,40 @@ buildPythonPackage (finalAttrs: {
# Additional testing by executing the example Python scripts supplied with mlx
# using the version of the library we've built.
passthru.tests = {
mlxTest =
runCommand "run-mlx-examples"
{
buildInputs = [ mlx ];
nativeBuildInputs = [ python ];
}
''
cp ${finalAttrs.src}/examples/python/logistic_regression.py .
${python.interpreter} logistic_regression.py
rm logistic_regression.py
passthru = {
inherit gguf-tools;
cp ${finalAttrs.src}/examples/python/linear_regression.py .
${python.interpreter} linear_regression.py
rm linear_regression.py
tests = {
mlxTest =
runCommand "run-mlx-examples"
{
buildInputs = [ mlx ];
nativeBuildInputs = [ python ];
}
''
cp ${finalAttrs.src}/examples/python/logistic_regression.py .
${python.interpreter} logistic_regression.py
rm logistic_regression.py
touch $out
'';
cp ${finalAttrs.src}/examples/python/linear_regression.py .
${python.interpreter} linear_regression.py
rm linear_regression.py
touch $out
'';
};
updateScript = lib.getExe (writeShellApplication {
name = "mlx-update";
runtimeInputs = [
common-updater-scripts
curl
nix
nix-update
perl
];
text = builtins.readFile ./update.sh;
});
};
meta = {

View File

@@ -0,0 +1,26 @@
nix-update "$UPDATE_NIX_ATTR_PATH"
version=$(nix eval --raw --file . "$UPDATE_NIX_ATTR_PATH.version")
# Use perl multiline matching to extract the correct FetchContent_Declare.
rev=$(
curl -fsSL "https://raw.githubusercontent.com/ml-explore/mlx/v$version/mlx/io/CMakeLists.txt" |
perl -0777 -ne '
if (/FetchContent_Declare\s*\(\s*gguflib\b.*?\bGIT_TAG\s+([^\s)]+)/s) {
print "$1\n";
}
'
)
if [[ -z "$rev" ]]; then
echo "Could not determine the gguf-tools revision for MLX $version" >&2
exit 1
fi
current_rev=$(nix eval --raw --file . "$UPDATE_NIX_ATTR_PATH.gguf-tools.rev")
if [[ "$rev" != "$current_rev" ]]; then
update-source-version \
"$UPDATE_NIX_ATTR_PATH" \
--source-key=gguf-tools \
--rev="$rev" \
--ignore-same-version
fi

View File

@@ -19,10 +19,6 @@ buildPythonPackage rec {
hash = "sha256-tIB4d1r/80kUN1NE1W9wo37ARBiMyuzj9wgG/TIqR+s=";
};
# Does not seem to have actual tests, but unittest discover
# recognizes some non-tests as tests and fails.
doCheck = false;
build-system = [
cython
numpy
@@ -34,10 +30,14 @@ buildPythonPackage rec {
srsly
];
# Does not seem to have actual tests, but unittest discover
# recognizes some non-tests as tests and fails.
doCheck = false;
pythonImportsCheck = [ "spacy_pkuseg" ];
meta = {
description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)";
description = "Chinese word segmentation toolkit for spaCy (fork of pkuseg-python)";
homepage = "https://github.com/explosion/spacy-pkuseg";
license = lib.licenses.mit;
maintainers = [ ];

View File

@@ -3,7 +3,6 @@
lib,
nixosTests,
stdenv,
fetchpatch,
...
}@args:
@@ -13,10 +12,10 @@ callPackage ./generic.nix args {
kernelModuleAttribute = "zfs_2_3";
kernelMinSupportedMajorMinor = "4.18";
kernelMaxSupportedMajorMinor = "7.0";
kernelMaxSupportedMajorMinor = "7.2";
# this package should point to the latest release.
version = "2.3.8";
version = "2.3.9";
tests = {
inherit (nixosTests.zfs) series_2_3;
@@ -30,5 +29,5 @@ callPackage ./generic.nix args {
amarshall
];
hash = "sha256-qNBInNRpWrmImcermSHC0emYmnnjNvxWj3QnGtA6SUg=";
hash = "sha256-JQc9JOJLrqKUqFowg+Bs2d2YWQXBjTqCCelL5JpnvyQ=";
}

View File

@@ -3,7 +3,6 @@
lib,
nixosTests,
stdenv,
fetchpatch,
...
}@args:
@@ -13,26 +12,13 @@ callPackage ./generic.nix args {
kernelModuleAttribute = "zfs_2_4";
kernelMinSupportedMajorMinor = "4.18";
kernelMaxSupportedMajorMinor = "7.0";
kernelMaxSupportedMajorMinor = "7.2";
# this package should point to the latest release.
version = "2.4.3";
version = "2.4.4";
# if adding a patch here, check if it also needs to be applied to zfs_unstable
extraPatches = [
# https://github.com/openzfs/zfs/issues/18366
# dedup data corruption fix unreleased as of OpenZFS 2.4.3
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/6fb72fda0f60d9efb591e320f83f78b19ec451cc.patch?full_index=1";
hash = "sha256-UuSVmO61Ux5S3F+JAtRnHyeVS4EFobDTKBuD5s8PI+k=";
})
# backport kernel memory corruption fix
# https://github.com/openzfs/zfs/issues/18787
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/223b8bc446851e5e796e5446ac24d03bbf468f43.patch?full_index=1";
hash = "sha256-I29A+NLYLzy7cMC8FQpBdSYbjFu/kscgTW8mAauPVf4=";
})
];
extraPatches = [ ];
tests = {
inherit (nixosTests.zfs) series_2_4;
@@ -46,5 +32,5 @@ callPackage ./generic.nix args {
amarshall
];
hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
hash = "sha256-ZgfHTPsNoeDq6GKP4Xiti7Keis3vIZLDaTGQjgCItIc=";
}

View File

@@ -24,7 +24,7 @@ let
gawk,
gnugrep,
gnused,
systemd,
systemdMinimal,
smartmontools,
enableMail ? false,
sysstat,
@@ -136,7 +136,7 @@ let
gawk
gnused
gnugrep
systemd
systemdMinimal
]
}"

View File

@@ -1,7 +1,6 @@
{
callPackage,
nixosTests,
fetchpatch,
...
}@args:
@@ -11,36 +10,23 @@ callPackage ./generic.nix args {
kernelModuleAttribute = "zfs_unstable";
kernelMinSupportedMajorMinor = "4.18";
kernelMaxSupportedMajorMinor = "7.0";
kernelMaxSupportedMajorMinor = "7.2";
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.4.3";
version = "2.4.4";
# rev = "";
# if adding a patch here, check if it also needs to be applied to the stable branches
extraPatches = [
# https://github.com/openzfs/zfs/issues/18366
# dedup data corruption fix unreleased as of OpenZFS 2.4.3
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/6fb72fda0f60d9efb591e320f83f78b19ec451cc.patch?full_index=1";
hash = "sha256-UuSVmO61Ux5S3F+JAtRnHyeVS4EFobDTKBuD5s8PI+k=";
})
# backport kernel memory corruption fix
# https://github.com/openzfs/zfs/issues/18787
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/223b8bc446851e5e796e5446ac24d03bbf468f43.patch?full_index=1";
hash = "sha256-I29A+NLYLzy7cMC8FQpBdSYbjFu/kscgTW8mAauPVf4=";
})
];
extraPatches = [ ];
tests = {
inherit (nixosTests.zfs) unstable;
};
hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
hash = "sha256-ZgfHTPsNoeDq6GKP4Xiti7Keis3vIZLDaTGQjgCItIc=";
extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

View File

@@ -9,7 +9,7 @@
let
buildFreshRssExtension = (callPackage ./freshrss-utils.nix { }).buildFreshRssExtension;
official_extensions_version = "unstable-2025-12-26";
official_extensions_rev_date = "2025-12-26";
official_extensions_src = fetchFromGitHub {
owner = "FreshRSS";
repo = "Extensions";
@@ -41,7 +41,7 @@ let
demo = buildFreshRssExtension {
FreshRssExtUniqueId = "Demo";
pname = "demo";
version = "unstable-2023-12-22";
version = "0.1-unstable-2023-12-22";
src = fetchFromGitHub {
owner = "FreshRSS";
repo = "xExtension-Demo";
@@ -96,7 +96,7 @@ let
title-wrap = buildFreshRssExtension {
FreshRssExtUniqueId = "TitleWrap";
pname = "title-wrap";
version = official_extensions_version;
version = "0.3.1-unstable-${official_extensions_rev_date}";
src = official_extensions_src;
sourceRoot = "${official_extensions_src.name}/xExtension-TitleWrap";
meta = {
@@ -110,7 +110,7 @@ let
unsafe-auto-login = buildFreshRssExtension {
FreshRssExtUniqueId = "UnsafeAutologin";
pname = "unsafe-auto-login";
version = official_extensions_version;
version = "1.0.0-unstable-${official_extensions_rev_date}";
src = official_extensions_src;
sourceRoot = "${official_extensions_src.name}/xExtension-UnsafeAutologin";
meta = {
@@ -124,7 +124,7 @@ let
youtube = buildFreshRssExtension {
FreshRssExtUniqueId = "YouTube";
pname = "youtube";
version = official_extensions_version;
version = "1.1.0-unstable-${official_extensions_rev_date}";
src = official_extensions_src;
sourceRoot = "${official_extensions_src.name}/xExtension-YouTube";
meta = {