Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-09-19 18:06:36 +00:00 committed by GitHub
commit ca7f2a47c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
80 changed files with 1348 additions and 865 deletions

View file

@ -1218,6 +1218,11 @@ lib.mapAttrs mkLicense (
fullName = "SGML UG SGML Parser Materials license";
};
sissl11 = {
spdxId = "SISSL";
fullName = "Sun Industry Standards Source License 1.1";
};
sleepycat = {
spdxId = "Sleepycat";
fullName = "Sleepycat License";

View file

@ -164,6 +164,8 @@
- `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.
- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
- The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
- The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.

View file

@ -218,7 +218,7 @@ in
Type = "simple";
Restart = "on-failure";
AmbientCapablities = [ ];
AmbientCapabilities = [ ];
CapabilityBoundingSet = [ ];
LockPersonality = true;
MemoryDenyWriteExecute = true;

View file

@ -1388,7 +1388,10 @@ in
sudo-rs = runTest ./sudo-rs.nix;
sunshine = runTest ./sunshine.nix;
suricata = runTest ./suricata.nix;
suwayomi-server = handleTest ./suwayomi-server.nix { };
suwayomi-server = import ./suwayomi-server.nix {
inherit runTest;
lib = pkgs.lib;
};
swap-file-btrfs = runTest ./swap-file-btrfs.nix;
swap-partition = runTest ./swap-partition.nix;
swap-random-encryption = runTest ./swap-random-encryption.nix;

View file

@ -1,10 +1,6 @@
{
system ? builtins.currentSystem,
pkgs,
lib ? pkgs.lib,
}:
{ lib, runTest }:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (lib) recursiveUpdate;
baseTestConfig = {
@ -17,22 +13,23 @@ let
settings.server.port = 1234;
};
};
testScript = ''
machine.wait_for_unit("suwayomi-server.service")
machine.wait_for_open_port(1234)
machine.succeed("curl --fail http://localhost:1234/")
'';
};
in
{
without-auth = makeTest (
without-auth = runTest (
recursiveUpdate baseTestConfig {
name = "suwayomi-server-without-auth";
testScript = ''
machine.wait_for_unit("suwayomi-server.service")
machine.wait_for_open_port(1234)
machine.succeed("curl --fail http://localhost:1234/")
'';
}
);
with-auth = makeTest (
with-auth = runTest (
recursiveUpdate baseTestConfig {
name = "suwayomi-server-with-auth";
@ -50,6 +47,12 @@ in
};
};
};
testScript = ''
machine.wait_for_unit("suwayomi-server.service")
machine.wait_for_open_port(1234)
machine.succeed("curl --fail -u alice:pass http://localhost:1234/")
'';
}
);
}

View file

@ -1,11 +1,11 @@
{
"packageVersion": "142.0.1-1",
"packageVersion": "143.0-1",
"source": {
"rev": "142.0.1-1",
"hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
"rev": "143.0-1",
"hash": "sha256-eR5ArTe/XVz5CCEzgZ061i4ta+opX+hvbcChscsTBcs="
},
"firefox": {
"version": "142.0.1",
"hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
"version": "143.0",
"hash": "sha512-Sf5eXbt1Ob4+TFF9PKxFPqm3OeYQQMSsGrzz1mZXMvul/5H7BA88ApSvD4woJCNalOYKycJuJcsU2J1LUMipEQ=="
}
}

View file

@ -71,27 +71,21 @@ in
rec {
mkKops = generic;
kops_1_27 = mkKops rec {
version = "1.27.1";
sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
kops_1_31 = mkKops rec {
version = "1.31.0";
sha256 = "sha256-q9megrNXXKJ/YqP/fjPHh8Oji4dPK5M3HLHa+ufwRAM=";
rev = "v${version}";
};
kops_1_28 = mkKops rec {
version = "1.28.7";
sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI=";
kops_1_32 = mkKops rec {
version = "1.32.1";
sha256 = "sha256-nQKeTDajtUffPBhPrPuaJ+1XWgLDUltwDQDZHkylys4=";
rev = "v${version}";
};
kops_1_29 = mkKops rec {
version = "1.29.2";
sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ=";
rev = "v${version}";
};
kops_1_30 = mkKops rec {
version = "1.30.4";
sha256 = "sha256-f+VdgQj6tHWrn+LG6qkArjcADYfpKjuOp+bU0BTYsWY=";
kops_1_33 = mkKops rec {
version = "1.33.0";
sha256 = "sha256-VnnKWcU83yqsKW54Q1tr99/Ln8ppMyB7GLl70rUFGDY=";
rev = "v${version}";
};
}

View file

@ -6,17 +6,17 @@
}:
let
snapshot = "20250105225747";
snapshot = "20250820092243";
in
stdenv.mkDerivation {
pname = "apparency";
version = "2.2";
version = "2.3";
src = fetchurl {
# Use externally archived download URL because
# upstream does not provide stable URLs for versioned releases
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg";
hash = "sha256-nktNbyJOXDydQPwb43Uq3nQv65XcwrqZTKu5OCcLyfU=";
hash = "sha256-QaP7Ll5ZK0QVHPFzDPmV8rd0XmY3Ie0VPBDXJEDMECU=";
};
nativeBuildInputs = [ undmg ];

View file

@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.117"
"@anthropic-ai/claude-code": "^1.0.119"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.117",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.117.tgz",
"integrity": "sha512-ZSBFpwPqMZJZq9//BYSW0MLGQY0svAtncPe2EVxohO87Gym6Dqi+IRSVZkWSwF07gmzZH3luqrepX3q33l7T+Q==",
"version": "1.0.119",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.119.tgz",
"integrity": "sha512-0SxTgt7Htr2okxL2Uk0Mv5eB8JxBrRCZCdtTNwuYC/OBl2F7UDM8YFtIwHz97ygCoJw49j7SL6s+/MIZGaEzrA==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"

View file

@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.117";
version = "1.0.119";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-mGAc09YRUE6sjy4/gimGVIbPuRHANOyBP/hpuHsbZVI=";
hash = "sha256-l6H3IaCIo15OkCR+QBsZJ9lQIxEaAuUOUy/yEQtcvDI=";
};
npmDepsHash = "sha256-U/trPqqN4FNuH6yHlvkPL9DHR2Lw21+3xVtwenu/4Fs=";
npmDepsHash = "sha256-J22dL6GuvMKRLZ7ZAkKn8iX/qBfgK/k3IXKPLGROwo4=";
postPatch = ''
cp ${./package-lock.json} package-lock.json

View file

@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "dns-collector";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "dmachard";
repo = "dns-collector";
tag = "v${finalAttrs.version}";
hash = "sha256-99mVCuoog9ZkJoCCcUWkRJ2vA0IwftEcsSl6I02Qd4A=";
hash = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
};
subPackages = [ "." ];
@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
];
vendorHash = "sha256-se4vNVydYFYk07Shb3eRLnVmE82HG36cwFRYCdZiZPM=";
vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
passthru.updateScript = nix-update-script { };

View file

@ -54,13 +54,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dolphin-emu";
version = "2506a";
version = "2509";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
tag = finalAttrs.version;
hash = "sha256-xYGq2Yt4Gqb/QDA6HZajs7JCwETufuqigk3bZbsgdEM=";
hash = "sha256-ZTNg8DRgtC1jS3MoYK1wwzjJbMkLNdkRub+KOg3NmYM=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''

View file

@ -6,18 +6,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "emmylua_doc_cli";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "EmmyLuaLs";
repo = "emmylua-analyzer-rust";
tag = finalAttrs.version;
hash = "sha256-93PlsVvlUravsnW7YBCii04jCEJPP+6U2vYbVBjcX8M=";
hash = "sha256-V/Sy5h0dLayf9Oxgh9eFfDm00hJbwq1WAD8k0AA5GTw=";
};
buildAndTestSubdir = "crates/emmylua_doc_cli";
cargoHash = "sha256-SbsYlIVWDpBU2bxJqXUtOiMHkOoa8Up27X7rVKLLLm0=";
cargoHash = "sha256-ijxLMf7FjX4LzrYwQilC1QfqRP91yFvq5WCoVFJ9V8M=";
nativeInstallCheckInputs = [
versionCheckHook

View file

@ -3,6 +3,7 @@
fetchFromGitHub,
python3Packages,
softhsm,
installShellFiles,
}:
python3Packages.buildPythonApplication rec {
@ -43,9 +44,35 @@ python3Packages.buildPythonApplication rec {
hsm = [ python-pkcs11 ];
};
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
rm -v $out/bin/*.py
'';
''
+
lib.strings.concatMapStrings
(
cmd:
# Unfortunately, espsecure and espefuse do not run in cross-compilation
lib.optionalString
(
python3Packages.stdenv.buildPlatform.canExecute python3Packages.stdenv.hostPlatform
|| cmd == "esptool"
)
''
installShellCompletion --cmd ${cmd} \
--bash <(_${lib.toUpper cmd}_COMPLETE=bash_source $out/bin/${cmd}) \
--zsh <(_${lib.toUpper cmd}_COMPLETE=zsh_source $out/bin/${cmd}) \
--fish <(_${lib.toUpper cmd}_COMPLETE=fish_source $out/bin/${cmd})
''
)
[
"esptool"
"espsecure"
"espefuse"
];
nativeCheckInputs =
with python3Packages;

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "feh";
version = "3.11.1";
version = "3.11.2";
src = fetchFromGitHub {
owner = "derf";
repo = "feh";
rev = finalAttrs.version;
hash = "sha256-gzMlPyuQft39U1hNs9PojohESqsjVxcPGuUbNRFMQBU=";
hash = "sha256-bwp/hzkuwQTgPakE0zkNtBWrNUkVWt9btTD8MVx+Xq4=";
};
outputs = [

View file

@ -12,7 +12,7 @@
libxml2,
openssl,
range-v3,
catch2,
catch2_3,
nasm,
buildEnv,
writeText,
@ -95,13 +95,13 @@ let
in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "fex";
version = "2509";
version = "2509.1";
src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${finalAttrs.version}";
hash = "sha256-Dq87cx7tv+HJvpy57L8dcApE+3E8VEyyTYKhDyoUfVU=";
hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";
leaveDotGit = true;
postFetch = ''
@ -192,7 +192,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeFeature "USE_LINKER" "lld")
(lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BUILD_THUNKS" true)
(lib.cmakeBool "BUILD_FEXCONFIG" withQt)
(lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}")
@ -206,7 +206,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
doCheck = true;
nativeCheckInputs = [ nasm ];
checkInputs = [ catch2 ];
checkInputs = [ catch2_3 ];
# List not exhaustive, e.g. because they depend on an x86 compiler or some
# other difficult-to-build test binaries.

View file

@ -1,13 +1,12 @@
{
lib,
writeText,
flutter329,
flutter335,
fetchFromGitHub,
}:
flutter329.buildFlutterApplication rec {
flutter335.buildFlutterApplication rec {
pname = "firmware-updater";
version = "0-unstable-2024-20-11";
version = "0-unstable-2025-09-09";
pubspecLock = lib.importJSON ./pubspec.lock.json;
@ -20,8 +19,8 @@ flutter329.buildFlutterApplication rec {
src = fetchFromGitHub {
owner = "canonical";
repo = "firmware-updater";
rev = "ab5d44d594d68d106aafb511252a94a24e94d601";
hash = "sha256-4a0OojgNvOpvM4+8uSslxxKb6uwKDfDkvHo29rMXynQ=";
rev = "402e97254b9d63c8d962c46724995e377ff922c8";
hash = "sha256-nQn5mlgNj157h++67+mhez/F1ALz4yY+bxiGsi0/xX8=";
};
meta = with lib; {

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,8 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchzip,
imagemagick,
libgbm,
libdrm,
@ -21,17 +23,21 @@ let
libdrm
];
pubspecLock = lib.importJSON ./pubspec.lock.json;
libwebrtc = fetchzip {
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.1.0/libwebrtc.zip";
sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
};
in
flutter332.buildFlutterApplication (
rec {
pname = "fluffychat-${targetFlutterPlatform}";
version = "2.0.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "krille-chan";
repo = "fluffychat";
tag = "v${version}";
hash = "sha256-fFc6nIVQUY9OiGkEc7jrzXnBQPDWC5x5A4/XHUhu6hs=";
hash = "sha256-Gk3PtIb90rmrEIq52aL+vBHhRG6LoyfG2jrAGH5Iyqo=";
};
inherit pubspecLock;
@ -84,6 +90,31 @@ flutter332.buildFlutterApplication (
})
];
customSourceBuilders = {
flutter_webrtc =
{ version, src, ... }:
stdenv.mkDerivation {
pname = "flutter_webrtc";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace third_party/CMakeLists.txt \
--replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc}
ln -s ${libwebrtc} third_party/libwebrtc
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
};
postInstall = ''
FAV=$out/app/fluffychat-linux/data/flutter_assets/assets/favicon.png
ICO=$out/share/icons

View file

@ -4,27 +4,21 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
"sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "76.0.0"
},
"_macros": {
"dependency": "transitive",
"description": "dart",
"source": "sdk",
"version": "0.3.3"
"version": "67.0.0"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
"sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.11.0"
"version": "6.4.1"
},
"animations": {
"dependency": "direct main",
@ -50,11 +44,11 @@
"dependency": "direct main",
"description": {
"name": "app_links",
"sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
"sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.4.0"
"version": "6.4.1"
},
"app_links_linux": {
"dependency": "transitive",
@ -90,11 +84,11 @@
"dependency": "direct main",
"description": {
"name": "archive",
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.1"
"version": "4.0.7"
},
"args": {
"dependency": "transitive",
@ -230,11 +224,11 @@
"dependency": "direct main",
"description": {
"name": "chewie",
"sha256": "4d9554a8f87cc2dc6575dfd5ad20a4375015a29edd567fd6733febe6365e2566",
"sha256": "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.11.3"
"version": "1.12.1"
},
"cli_config": {
"dependency": "transitive",
@ -356,15 +350,35 @@
"source": "hosted",
"version": "1.0.8"
},
"dart_earcut": {
"dependency": "transitive",
"description": {
"name": "dart_earcut",
"sha256": "e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
},
"dart_polylabel2": {
"dependency": "transitive",
"description": {
"name": "dart_polylabel2",
"sha256": "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
},
"dart_webrtc": {
"dependency": "transitive",
"description": {
"name": "dart_webrtc",
"sha256": "5b76fd85ac95d6f5dee3e7d7de8d4b51bfbec1dc73804647c6aebb52d6297116",
"sha256": "a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.3+hotfix.2"
"version": "1.5.3+hotfix.4"
},
"dbus": {
"dependency": "transitive",
@ -380,11 +394,11 @@
"dependency": "direct main",
"description": {
"name": "desktop_drop",
"sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d",
"sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.4"
"version": "0.6.1"
},
"desktop_notifications": {
"dependency": "direct main",
@ -400,41 +414,41 @@
"dependency": "direct main",
"description": {
"name": "device_info_plus",
"sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.1.2"
"version": "11.5.0"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.2"
"version": "7.0.3"
},
"dynamic_color": {
"dependency": "direct main",
"description": {
"name": "dynamic_color",
"sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
"sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.7.0"
"version": "1.8.1"
},
"emoji_picker_flutter": {
"dependency": "direct main",
"description": {
"name": "emoji_picker_flutter",
"sha256": "08567e6f914d36c32091a96cf2f51d2558c47aa2bd47a590dc4f50e42e0965f6",
"sha256": "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.0"
"version": "4.3.0"
},
"emojis": {
"dependency": "direct main",
@ -490,11 +504,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
"sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.3.7"
"version": "10.3.1"
},
"file_selector": {
"dependency": "direct main",
@ -592,16 +606,6 @@
"source": "sdk",
"version": "0.0.0"
},
"flutter_cache_manager": {
"dependency": "direct main",
"description": {
"name": "flutter_cache_manager",
"sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1"
},
"flutter_driver": {
"dependency": "transitive",
"description": "flutter",
@ -612,11 +616,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_foreground_task",
"sha256": "6cf10a27f5e344cd2ecad0752d3a5f4ec32846d82fda8753b3fe2480ebb832a3",
"sha256": "9f1b25a81db95d7119d2c5cffc654048cbdd49d4056183e1beadc1a6a38f3e29",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
"version": "9.1.0"
},
"flutter_highlighter": {
"dependency": "direct main",
@ -712,31 +716,41 @@
"dependency": "direct main",
"description": {
"name": "flutter_local_notifications",
"sha256": "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35",
"sha256": "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "17.2.4"
"version": "19.4.0"
},
"flutter_local_notifications_linux": {
"dependency": "transitive",
"description": {
"name": "flutter_local_notifications_linux",
"sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af",
"sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.1"
"version": "6.0.0"
},
"flutter_local_notifications_platform_interface": {
"dependency": "transitive",
"description": {
"name": "flutter_local_notifications_platform_interface",
"sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66",
"sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.2.0"
"version": "9.1.0"
},
"flutter_local_notifications_windows": {
"dependency": "transitive",
"description": {
"name": "flutter_local_notifications_windows",
"sha256": "ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.2"
},
"flutter_localizations": {
"dependency": "direct main",
@ -748,21 +762,21 @@
"dependency": "direct main",
"description": {
"name": "flutter_map",
"sha256": "87cc8349b8fa5dccda5af50018c7374b6645334a0d680931c1fe11bce88fa5bb",
"sha256": "df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.1"
"version": "8.2.1"
},
"flutter_native_splash": {
"dependency": "direct dev",
"description": {
"name": "flutter_native_splash",
"sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7",
"sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.4"
"version": "2.4.6"
},
"flutter_new_badger": {
"dependency": "direct main",
@ -933,11 +947,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_webrtc",
"sha256": "b832dc76c0d1577f14aaf35e9c38d4ed7667cbc89c492b7bf4505d8d5f62e08b",
"sha256": "69095ba39b83da3de48286dfc0769aa8e9f10491f70058dc8d8ecc960ef7a260",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.12+hotfix.1"
"version": "1.0.0"
},
"frontend_server_client": {
"dependency": "transitive",
@ -955,25 +969,35 @@
"source": "sdk",
"version": "0.0.0"
},
"geoclue": {
"dependency": "transitive",
"description": {
"name": "geoclue",
"sha256": "c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.1"
},
"geolocator": {
"dependency": "direct main",
"description": {
"name": "geolocator",
"sha256": "f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2",
"sha256": "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "13.0.4"
"version": "14.0.2"
},
"geolocator_android": {
"dependency": "transitive",
"description": {
"name": "geolocator_android",
"sha256": "fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d",
"sha256": "179c3cb66dfa674fc9ccbf2be872a02658724d1c067634e2c427cf6df7df901a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.6.2"
"version": "5.0.2"
},
"geolocator_apple": {
"dependency": "transitive",
@ -985,6 +1009,16 @@
"source": "hosted",
"version": "2.3.13"
},
"geolocator_linux": {
"dependency": "transitive",
"description": {
"name": "geolocator_linux",
"sha256": "c4e966f0a7a87e70049eac7a2617f9e16fd4c585a26e4330bdfc3a71e6a721f3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.3"
},
"geolocator_platform_interface": {
"dependency": "transitive",
"description": {
@ -1019,11 +1053,11 @@
"dependency": "transitive",
"description": {
"name": "get_it",
"sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
"sha256": "e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.7.0"
"version": "8.1.0"
},
"glob": {
"dependency": "transitive",
@ -1039,11 +1073,21 @@
"dependency": "direct main",
"description": {
"name": "go_router",
"sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
"sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "15.1.2"
"version": "16.1.0"
},
"gsettings": {
"dependency": "transitive",
"description": {
"name": "gsettings",
"sha256": "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.8"
},
"gtk": {
"dependency": "transitive",
@ -1075,26 +1119,6 @@
"source": "hosted",
"version": "0.1.1"
},
"hive": {
"dependency": "direct main",
"description": {
"name": "hive",
"sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.3"
},
"hive_flutter": {
"dependency": "direct main",
"description": {
"name": "hive_flutter",
"sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"html": {
"dependency": "direct main",
"description": {
@ -1119,11 +1143,11 @@
"dependency": "direct main",
"description": {
"name": "http",
"sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.5.0"
},
"http_multi_server": {
"dependency": "transitive",
@ -1149,11 +1173,11 @@
"dependency": "direct main",
"description": {
"name": "image",
"sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
"sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.0"
"version": "4.5.4"
},
"image_picker": {
"dependency": "direct main",
@ -1295,11 +1319,11 @@
"dependency": "direct main",
"description": {
"name": "just_audio",
"sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e",
"sha256": "679637a3ec5b6e00f36472f5a3663667df00ee4822cbf5dafca0f568c710960a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.46"
"version": "0.10.4"
},
"just_audio_platform_interface": {
"dependency": "transitive",
@ -1421,16 +1445,6 @@
"source": "hosted",
"version": "1.3.0"
},
"macros": {
"dependency": "transitive",
"description": {
"name": "macros",
"sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3-main.0"
},
"markdown": {
"dependency": "transitive",
"description": {
@ -1465,11 +1479,11 @@
"dependency": "direct main",
"description": {
"name": "matrix",
"sha256": "996e3b1560959afaa3118ec2b5a06734ad29acf64f9c3c09a605c3ddef22039f",
"sha256": "4e6c186115ee041c430aa5ed5210499d60e4323f907cea1f5e8a2f73a513a1bf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "1.1.1"
},
"meta": {
"dependency": "transitive",
@ -1495,21 +1509,21 @@
"dependency": "direct main",
"description": {
"name": "mime",
"sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
"sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.6"
"version": "2.0.0"
},
"msix": {
"dependency": "direct dev",
"description": {
"name": "msix",
"sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
"sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.9"
"version": "3.16.12"
},
"native_imaging": {
"dependency": "direct main",
@ -1565,21 +1579,21 @@
"dependency": "direct main",
"description": {
"name": "package_info_plus",
"sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
"sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.3.0"
"version": "8.3.1"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "package_info_plus_platform_interface",
"sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
"sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.0"
"version": "3.2.1"
},
"pana": {
"dependency": "transitive",
@ -1591,16 +1605,6 @@
"source": "hosted",
"version": "0.21.45"
},
"pasteboard": {
"dependency": "direct main",
"description": {
"name": "pasteboard",
"sha256": "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"path": {
"dependency": "direct main",
"description": {
@ -1675,21 +1679,21 @@
"dependency": "direct main",
"description": {
"name": "permission_handler",
"sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
"sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.4.0"
"version": "12.0.1"
},
"permission_handler_android": {
"dependency": "transitive",
"description": {
"name": "permission_handler_android",
"sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
"sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "12.1.0"
"version": "13.0.1"
},
"permission_handler_apple": {
"dependency": "transitive",
@ -1801,16 +1805,6 @@
"source": "hosted",
"version": "0.10.2+1"
},
"polylabel": {
"dependency": "transitive",
"description": {
"name": "polylabel",
"sha256": "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"pool": {
"dependency": "transitive",
"description": {
@ -1821,15 +1815,25 @@
"source": "hosted",
"version": "1.5.1"
},
"posix": {
"dependency": "transitive",
"description": {
"name": "posix",
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.3"
},
"pretty_qr_code": {
"dependency": "direct main",
"description": {
"name": "pretty_qr_code",
"sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
"sha256": "2291db3f68d70a3dcd46c6bd599f30991ae4c02f27f36215fbb3f4865a609259",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.0"
"version": "3.5.0"
},
"process": {
"dependency": "transitive",
@ -2075,21 +2079,21 @@
"dependency": "direct main",
"description": {
"name": "share_plus",
"sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
"sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.1.4"
"version": "11.1.0"
},
"share_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "share_plus_platform_interface",
"sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
"sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.2"
"version": "6.1.0"
},
"shared_preferences": {
"dependency": "direct main",
@ -2257,26 +2261,6 @@
"source": "hosted",
"version": "7.0.0"
},
"sqflite": {
"dependency": "transitive",
"description": {
"name": "sqflite",
"sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
},
"sqflite_android": {
"dependency": "transitive",
"description": {
"name": "sqflite_android",
"sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
},
"sqflite_common": {
"dependency": "transitive",
"description": {
@ -2291,51 +2275,31 @@
"dependency": "direct main",
"description": {
"name": "sqflite_common_ffi",
"sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1",
"sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.5"
},
"sqflite_darwin": {
"dependency": "transitive",
"description": {
"name": "sqflite_darwin",
"sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
},
"sqflite_platform_interface": {
"dependency": "transitive",
"description": {
"name": "sqflite_platform_interface",
"sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.3.6"
},
"sqlcipher_flutter_libs": {
"dependency": "direct main",
"description": {
"name": "sqlcipher_flutter_libs",
"sha256": "777c3469ada8fe6b808bd50f1c752cdd2ca1b1f3cf751d434502ead15334f3a5",
"sha256": "dd1fcc74d5baf3c36ad53e2652b2d06c9f8747494a3ccde0076e88b159dfe622",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.6"
"version": "0.6.8"
},
"sqlite3": {
"dependency": "transitive",
"description": {
"name": "sqlite3",
"sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e",
"sha256": "608b56d594e4c8498c972c8f1507209f9fd74939971b948ddbbfbfd1c9cb3c15",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.5"
"version": "2.7.7"
},
"stack_trace": {
"dependency": "transitive",
@ -2461,11 +2425,11 @@
"dependency": "transitive",
"description": {
"name": "timezone",
"sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
"sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.4"
"version": "0.10.1"
},
"tint": {
"dependency": "transitive",
@ -2521,31 +2485,31 @@
"dependency": "direct main",
"description": {
"name": "unifiedpush",
"sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f",
"sha256": "1418375efb580af9640de4eaf4209cb6481f9a48792648ced3051f30e67d9568",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.2"
"version": "6.0.2"
},
"unifiedpush_android": {
"dependency": "transitive",
"description": {
"name": "unifiedpush_android",
"sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134",
"sha256": "2f25db8eb2fc3183bf2e43db89fff20b2587adc1c361e1d1e06b223a0d45b50a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.0"
"version": "3.1.1"
},
"unifiedpush_platform_interface": {
"dependency": "transitive",
"description": {
"name": "unifiedpush_platform_interface",
"sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d",
"sha256": "bb49d2748211520e35e0374ab816faa8a2c635267e71909d334ad868d532eba5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.2"
"version": "3.0.1"
},
"unifiedpush_ui": {
"dependency": "direct main",
@ -2577,6 +2541,16 @@
"source": "hosted",
"version": "2.2.2"
},
"universal_platform": {
"dependency": "transitive",
"description": {
"name": "universal_platform",
"sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"unorm_dart": {
"dependency": "transitive",
"description": {
@ -2591,11 +2565,11 @@
"dependency": "direct main",
"description": {
"name": "url_launcher",
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
"sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
"version": "6.3.2"
},
"url_launcher_android": {
"dependency": "transitive",
@ -2701,11 +2675,11 @@
"dependency": "direct main",
"description": {
"name": "video_player",
"sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
"sha256": "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.5"
"version": "2.10.0"
},
"video_player_android": {
"dependency": "transitive",
@ -2858,24 +2832,24 @@
"version": "1.2.2+hotfix.2"
},
"win32": {
"dependency": "direct overridden",
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.5.3"
"version": "5.14.0"
},
"win32_registry": {
"dependency": "transitive",
"description": {
"name": "win32_registry",
"sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
"sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.5"
"version": "2.1.0"
},
"window_to_front": {
"dependency": "transitive",
@ -2929,7 +2903,7 @@
}
},
"sdks": {
"dart": ">=3.7.0 <4.0.0",
"flutter": ">=3.27.0"
"dart": ">=3.8.0 <4.0.0",
"flutter": ">=3.29.0"
}
}

View file

@ -19,19 +19,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gancio";
version = "1.26.1";
version = "1.28.0";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "les";
repo = "gancio";
rev = "v${finalAttrs.version}";
hash = "sha256-i69sne2kkimAuwYZb0r7LfoVOdl8v4hN0s4PzgELOrk=";
hash = "sha256-0pwZdS/EQNxcHQhvNrTEm70VGkbDdILDgdqCV0qwd3k=";
};
offlineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-Jvp45pKeqyQN8lb8rzTryOGDTVwnETOw8OEUUnOPjEE=";
hash = "sha256-skUlzmjKfeVdvKAHj5L+xO2LEn1j8af8DOjHTATLedo=";
};
nativeBuildInputs = [

View file

@ -12,11 +12,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gemini-cli-bin";
version = "0.4.0";
version = "0.5.4";
src = fetchurl {
url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}";
hash = "sha256-5uPzphiVsqczo3XOVrT0c0Y9hkFRUsyaORPRgJSqpck=";
hash = "sha256-rwvL5cjxPOC1ZWopo54+I1NWGMewnm6lTTl6YhNlSBk=";
};
phases = [

View file

@ -6,7 +6,6 @@ set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
NIX_FILE="package.nix"
RELEASE_ID="latest"
GITHUB_REPO="$1"
ASSET_NAME="$2"
@ -14,10 +13,18 @@ REV_PREFIX="${3:-v}"
CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")"
CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")"
JQ_FILTER='[.[] | select((.tag_name | test("preview|nightly")) | not)] |
first | .tag_name, (.assets[] | select(.name == $asset_name) | .digest)'
{
read -r LATEST_VER
read -r ASSET_DIGEST
} < <(curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${GITHUB_REPO}/releases/${RELEASE_ID}" | jq -r ".tag_name, (.assets[] | select(.name == \"${ASSET_NAME}\") | .digest)")
} < <(
curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \
"https://api.github.com/repos/${GITHUB_REPO}/releases" |
jq -r --arg asset_name "${ASSET_NAME}" "${JQ_FILTER}"
)
LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}"

View file

@ -7,20 +7,17 @@
}:
crystal.buildCrystalPackage rec {
pname = "gi-crystal";
version = "0.24.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "hugopl";
repo = "gi-crystal";
rev = "v${version}";
hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ=";
hash = "sha256-+sc36YjaVKBkrg8Ond4hCZoObnSHIU/jyMRalZ+OAwk=";
};
# Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
# when the package name happens to start with “lib”.
patches = [
./src.patch
./store-friendly-library-name.patch
];
nativeBuildInputs = [ gobject-introspection ];

View file

@ -1,10 +0,0 @@
--- a/src/generator/lib_gen.cr 1969-12-31 17:00:01.000000000 -0700
+++ b/src/generator/lib_gen.cr 2023-07-14 11:48:41.509397114 -0600
@@ -10,7 +10,7 @@
private def libraries : Array(String)
namespace.shared_libraries.map do |library|
- library[/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1]
+ library[/(?:\/[^\/]*)+\/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1]
end
end

View file

@ -0,0 +1,67 @@
{
lib,
stdenv,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
freetype,
harfbuzz,
imlib2,
libjpeg,
ncurses,
openjpeg,
zlib,
xorg,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jfbview";
version = "0.6.0";
src = fetchFromGitHub {
owner = "jichu4n";
repo = "jfbview";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-ASgKXk5iVqKsBc1uzakHs5ojUb6AptGm9LxNyFcDngc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
freetype
harfbuzz
imlib2
libjpeg
ncurses
openjpeg
xorg.libX11
zlib
];
env.LDFLAGS = "-lImlib2";
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTING" false)
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "/") # relative to $out
];
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "PDF and image viewer for the Linux framebuffer";
homepage = "https://github.com/jichu4n/jfbview";
changelog = "https://github.com/jichu4n/jfbview/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ulysseszhan ];
platforms = lib.platforms.linux;
mainProgram = "jfbview";
};
})

View file

@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
version = "2.126.2";
version = "2.128.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-cnY/XfJuzlT1HyyBJcmgsNF9ihkDBS/y35idTLj+DFE=";
hash = "sha256-qJuvpzBeGlB4nAu7vLDcppzeleo/7vxC5MrxCBqlsKM=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdns-scanner";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "CramBL";
repo = "mdns-scanner";
tag = "v${finalAttrs.version}";
hash = "sha256-/r2yycdNghvZPS2gJIrf3NNfuX1yICCFVmnqXVkDXVE=";
hash = "sha256-0MHt/kSR6JvfCk08WIDPz6R9YYzDJ9RRTM6MU6sEwHk=";
};
cargoHash = "sha256-dPk/p4lb4TJvIM6hpbVNlCbDXjzmbP+ulYcG38idQtI=";
cargoHash = "sha256-oJSsuU1vkisDISnp+/jFs1cWEVxr586l8yHbG6fkPjQ=";
meta = {
homepage = "https://github.com/CramBL/mdns-scanner";

View file

@ -8,23 +8,23 @@
let
hlsJs = fetchurl {
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.9/dist/hls.min.js";
hash = "sha256-GObcOPuwxxMg0WOtl5BahSg9A3ds1IcCP+DPGZ8c27I=";
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.12/dist/hls.min.js";
hash = "sha256-z9adeEMx2bwAw7qDIPG+vRM/AQJ/zAJl0i4vaycHHaM=";
};
in
buildGoModule (finalAttrs: {
pname = "mediamtx";
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "bluenviron";
repo = "mediamtx";
tag = "v${finalAttrs.version}";
hash = "sha256-I1oKzovSv6hf2/lr2E5pRSqHV/pVoskNwn+gHRz8yv8=";
hash = "sha256-omeaOAhH4adNpA0VXxcZkre3tGZUwHxBrIT85X3D+n0=";
};
vendorHash = "sha256-5wSdbg7EAdvCUfIKxuX1aGihzHcwFM6Fiu/3eU1dMEY=";
vendorHash = "sha256-YSH8cu7+LIsJ3/o2FYBYlnc6adORJdzhCqQVH0252Ec=";
postPatch = ''
cp ${hlsJs} internal/servers/hls/hls.min.js

View file

@ -162,11 +162,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "140.0.3485.66";
version = "140.0.3485.81";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-/ITJFChnQa5XK4nQe3biGw6vvV+pLbbZNb989XecUGY=";
hash = "sha256-8GX70RKXRyhaPVhfg2bB0JDLkmpcwvZDUtlyKusBTN8=";
};
# With strictDeps on, some shebangs were not being patched correctly

View file

@ -7,18 +7,18 @@
nix-update-script,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "miniflux";
version = "2.2.12";
version = "2.2.13";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
tag = version;
hash = "sha256-DeSNI2GFqRF4jdfly44nohCPE4vOXKSaaCkHgKwS4Vs=";
tag = finalAttrs.version;
hash = "sha256-u3YnABf+ik7q29JtOSlK+UlInLRq5mMlH7vIDpxOOvk=";
};
vendorHash = "sha256-bMm2U+4pzafMD2BoRVbwEkzixOgWqw5eGAmw+OCJ9kQ=";
vendorHash = "sha256-JBT3BUFbPrSpkeZUoGiJJaeiSyXu8y+xcHWPNpxo3cU=";
nativeBuildInputs = [ installShellFiles ];
@ -27,7 +27,7 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X miniflux.app/v2/internal/version.Version=${version}"
"-X miniflux.app/v2/internal/version.Version=${finalAttrs.version}"
];
postInstall = ''
@ -42,6 +42,7 @@ buildGoModule rec {
meta = with lib; {
description = "Minimalist and opinionated feed reader";
changelog = "https://miniflux.app/releases/${finalAttrs.version}.html";
homepage = "https://miniflux.app/";
license = licenses.asl20;
maintainers = with maintainers; [
@ -52,4 +53,4 @@ buildGoModule rec {
];
mainProgram = "miniflux";
};
}
})

View file

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "nom";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "guyfedwards";
repo = "nom";
tag = "v${version}";
hash = "sha256-NgA4gAXHOz6ErBT/txSOpEUPMmdl0YObdPVda2wv4l4=";
hash = "sha256-agQG6DIVjR2nVXGMl7ekTvGOpDkszq8FRwNyGcN9/f4=";
};
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";

View file

@ -19,12 +19,19 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "noseyparker";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-6GxkIxLEgbIgg4nSHvmRedm8PAPBwVxLQUnQzh3NonA=";
};
cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno=";
# Fix error: failed to run custom build command for `vectorscan-rs-sys v0.0.5`
# Failed to get C++ compiler version: Os { code: 2, kind: NotFound, message: "No such file or directory" }
postPatch = ''
substituteInPlace $(find ../noseyparker-${version}-vendor -name "vectorscan-rs-sys*")/build.rs \
--replace-fail 'Command::new("c++")' 'Command::new("${stdenv.cc.targetPrefix}c++")'
'';
checkFlags = [
# These tests expect access to network to clone and use GitHub API
"--skip=github::github_repos_list_multiple_user_dedupe_jsonl_format"
@ -56,7 +63,7 @@ rustPlatform.buildRustPackage rec {
openssl
];
OPENSSL_NO_VENDOR = 1;
env.OPENSSL_NO_VENDOR = 1;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
mkdir -p manpages

View file

@ -22,12 +22,12 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "0.9.9";
version = "0.10.1";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-VHg5yZeU380ggCUwgq2yUD4jV0IiacsIDlcoUjZzuFA=";
hash = "sha256-ii8hGDz9POkj0ZIDiF+mkaExpTvlj6ea4ggO7i7grXI=";
};
tui = buildGoModule {

View file

@ -160,7 +160,11 @@ stdenv.mkDerivation rec {
to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
'';
homepage = "https://www.openvswitch.org/";
license = lib.licenses.asl20;
license = with lib.licenses; [
asl20
lgpl21Plus # ovs-bugtool
sissl11 # lib/sflow
];
maintainers = with lib.maintainers; [
adamcstephens
booxter

View file

@ -141,7 +141,11 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://www.ovn.org";
changelog = "https://github.com/ovn-org/ovn/blob/refs/tags/${finalAttrs.src.tag}/NEWS";
license = lib.licenses.asl20;
license = with lib.licenses; [
asl20
lgpl21Plus # bugtool plugins
sissl11 # lib/sflow from ovs submodule
];
maintainers = with lib.maintainers; [
adamcstephens
booxter

View file

@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
webkitgtk_4_1
];
pname = "paretosecurity";
version = "0.3.4";
version = "0.3.6";
src = fetchFromGitHub {
owner = "ParetoSecurity";
repo = "agent";
rev = finalAttrs.version;
hash = "sha256-jRaCcONfFch4cQ4clS/TaN0KxSnohSzBinIVr0ePymA=";
hash = "sha256-7orZ9+vLUooHOmgw/i1JP6wOFvGaChX+EujtuYipxm0=";
};
vendorHash = "sha256-y9x5RplVOr4mIOPTg86VvFWXkvZ1FTc9Ulc/yXb9/WU=";

View file

@ -6,6 +6,7 @@
"floating": "sha256-TJ2i3hTOQ4euHWr+lfQU44L3vVehmWVdZuAzNyVaEfA=",
"flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
"material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=",
"media_kit_video": "sha256-RI2ddJLY/CyQ7OHvfZI/ysQPytUpbv9gxdJftzx8owc=",
"media_kit_libs_android_video": "sha256-o5qsqJe4TjOhwtgnc20Ga1y4IyxdhC/VmeAsFMDoHuo=",
"media_kit_video": "sha256-TPYmT5Muv98wuZUO9evd40uIWp/XDk0+GIfEgd/m4mg=",
"webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE="
}

View file

@ -11,8 +11,8 @@
}:
let
version = "1.1.4.3";
rev = "fc6f51787ba0f1aa45afd494d3c5524f908d8631";
version = "1.1.4.4";
rev = "f0f52246777f2640025048f561e908cf1d3c3ead";
description = "Third-party Bilibili client developed in Flutter";
in
@ -29,7 +29,7 @@ flutter335.buildFlutterApplication.override
owner = "bggRGjQaUbCoE";
repo = "PiliPlus";
inherit rev;
hash = "sha256-jlbMKFShqrdGlVAutRSUVY+rGP/Sy7e454jahRRHkJk=";
hash = "sha256-5ISSlYMbP0SaSP0SLIHXC3VRXrVZ78kfl07ekgzFhNA=";
};
# Disable update check.

View file

@ -265,11 +265,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb",
"sha256": "1b3b173f3379c8f941446267868548b6fc67e9134d81f4842eb98bb729451359",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.11.1"
"version": "8.11.2"
},
"cached_network_image": {
"dependency": "direct main",
@ -644,16 +644,6 @@
"source": "git",
"version": "6.2.1"
},
"fading_edge_scrollview": {
"dependency": "direct overridden",
"description": {
"name": "fading_edge_scrollview",
"sha256": "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.1"
},
"fake_async": {
"dependency": "transitive",
"description": {
@ -738,11 +728,11 @@
"dependency": "direct main",
"description": {
"name": "fl_chart",
"sha256": "577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7",
"sha256": "d3f82f4a38e33ba23d05a08ff304d7d8b22d2a59a5503f20bd802966e915db89",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
"version": "1.1.0"
},
"flex_seed_scheme": {
"dependency": "direct main",
@ -962,11 +952,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
"sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.0"
"version": "2.2.1"
},
"flutter_test": {
"dependency": "direct dev",
@ -1442,13 +1432,14 @@
"version": "1.1.11"
},
"media_kit_libs_android_video": {
"dependency": "transitive",
"dependency": "direct overridden",
"description": {
"name": "media_kit_libs_android_video",
"sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7",
"url": "https://pub.dev"
"path": "libs/android/media_kit_libs_android_video",
"ref": "version_1.2.5",
"resolved-ref": "f89452bc27af26324a83961c8286d4f41432a5f9",
"url": "https://github.com/My-Responsitories/media-kit.git"
},
"source": "hosted",
"source": "git",
"version": "1.3.7"
},
"media_kit_libs_ios_video": {
@ -1502,7 +1493,7 @@
"version": "1.0.11"
},
"media_kit_native_event_loop": {
"dependency": "transitive",
"dependency": "direct overridden",
"description": {
"name": "media_kit_native_event_loop",
"sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40",
@ -1516,7 +1507,7 @@
"description": {
"path": "media_kit_video",
"ref": "version_1.2.5",
"resolved-ref": "4785f3223ff04d86b1644ab114e3960723ddf7cd",
"resolved-ref": "c4655bfb4bf81b6bb450d252184da20e2fbba292",
"url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
},
"source": "git",
@ -2458,16 +2449,6 @@
"source": "hosted",
"version": "15.0.2"
},
"volume_controller": {
"dependency": "transitive",
"description": {
"name": "volume_controller",
"sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.8"
},
"wakelock_plus": {
"dependency": "direct main",
"description": {
@ -2602,6 +2583,6 @@
},
"sdks": {
"dart": ">=3.9.0 <4.0.0",
"flutter": ">=3.35.2"
"flutter": ">=3.35.3"
}
}

View file

@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-authenticator";
version = "1.1.2";
version = "1.1.4";
src = fetchurl {
url = "https://proton.me/download/authenticator/linux/ProtonAuthenticator_${finalAttrs.version}_amd64.deb";
hash = "sha256-66OqxTlW0DsKH8+HcxzH7zettNm1eXP0ZjUp7ksYpXc=";
hash = "sha256-SoTeqnYDMgCoWLGaQZXaHiRKGreFn7FPSz5C0O88uWM=";
};
dontConfigure = true;

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "radicale";
version = "3.5.5";
version = "3.5.6";
pyproject = true;
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
tag = "v${version}";
hash = "sha256-Hrjqf0wm2Et6PMT94a0H/iJQQSEz4pfL7E4Ic0tstaY=";
hash = "sha256-jMqy6vFT2DwF8NsANBm2Z+ApIBDUXqNaBbk+8zObQOI=";
};
build-system = with python3.pkgs; [

View file

@ -1,7 +1,7 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } {
pname = "signal-desktop-bin";
version = "7.69.0";
version = "7.71.0";
libdir = "usr/lib64/signal-desktop";
bindir = "usr/bin";
@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
bsdtar -xf $downloadedFile -C "$out"
'';
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09522003-signal-desktop/signal-desktop-7.69.0-1.fc42.aarch64.rpm";
hash = "sha256-jvBSQZfP06tuhy1uhOPeHXkmYsMi/ptRe9P2mgTeAoU=";
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09571107-signal-desktop/signal-desktop-7.71.0-1.fc42.aarch64.rpm";
hash = "sha256-sNGIkO2HAXl0ykFyZNNV75iVUQ+oRGv6NZW8tVUxfJA=";
}

View file

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop-bin";
version = "7.69.0";
version = "7.71.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-iOp0ASFPsOncifoW7Bou/hLmer+rml0mtzYrH3R9Mf0=";
hash = "sha256-G4wCIzKnWwBYSTuXhZ6681Z2+0Rn2bpvb3vhKMAXFc4=";
};
sourceRoot = ".";

View file

@ -1,12 +1,12 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } rec {
pname = "signal-desktop-bin";
version = "7.69.0";
version = "7.71.0";
libdir = "opt/Signal";
bindir = libdir;
extractPkg = "dpkg-deb -x $downloadedFile $out";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-QFK/6f+/NGHfKCu52EpbpW98dwOmCL52vjmDpxR3WXk=";
hash = "sha256-y7ONN6VBVFH8zyXJNM3+cY4JegSolXfhH3T85WiM2Dk=";
}

View file

@ -3,22 +3,21 @@
stdenvNoCC,
fetchurl,
makeWrapper,
jdk17_headless,
jdk21_headless,
nixosTests,
}:
let
jdk = jdk17_headless;
jdk = jdk21_headless;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "suwayomi-server";
version = "1.1.1";
revision = 1535;
version = "2.1.1867";
src = fetchurl {
url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}-r${toString finalAttrs.revision}.jar";
hash = "sha256-mPzREuH89RGhZLK+5aIPuq1gmNGc9MGG0wh4ZV5dLTg=";
url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}.jar";
hash = "sha256-UeMHwlgeThoAKZGrPjp3UDyLB0xCaVmHqYSnOC0Kxa8=";
};
nativeBuildInputs = [
@ -42,9 +41,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
};
meta = with lib; {
description = "Free and open source manga reader server that runs extensions built for Tachiyomi";
description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";
longDescription = ''
Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.
Suwayomi is an independent Mihon (Tachiyomi) compatible software and is not a Fork of Mihon (Tachiyomi).
Suwayomi-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc.
'';
@ -53,6 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
changelog = "https://github.com/Suwayomi/Suwayomi-Server/releases/tag/v${finalAttrs.version}";
license = licenses.mpl20;
platforms = jdk.meta.platforms;
sourceProvenance = [ sourceTypes.binaryBytecode ];
maintainers = with maintainers; [ ratcornu ];
mainProgram = "tachidesk-server";
};

View file

@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tcping-rs";
version = "1.2.18";
version = "1.2.19";
src = fetchFromGitHub {
owner = "lvillis";
repo = "tcping-rs";
tag = version;
hash = "sha256-G9LZ9XlIl/JYji/GgznQnIbnV83qi9kZqCkaZJ0kENI=";
hash = "sha256-I7rcIemdPGFPBeOoIRft0tq49ikDs49UH5sEobL6fOA=";
};
cargoHash = "sha256-INbXvNfn3vmXzZgaDUwl1wgbQ2wVQcCP0ZV2dpZedQY=";
cargoHash = "sha256-k+Hm6dHy6igk1deeVrWrAOdhlz0h/jen6pVNaGvB7Ak=";
checkFlags = [
# This test requires external network access

View file

@ -3,21 +3,40 @@
buildGoModule,
fetchFromGitea,
installShellFiles,
stdenv,
}:
buildGoModule rec {
pname = "tea";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "tea";
rev = "v${version}";
sha256 = "sha256-Dhb3y13sxkyE+2BjNj7YcsjiIPgznIVyuzWs0F8LNfU=";
sha256 = "sha256-jM/TR3bApWv0ci98Vb/0YPjlmLuO91WPY9eMHBInIQI=";
};
vendorHash = "sha256-mKCsBPBWs3+61em53cEB0shTLXgUg4TivJRogy1tYXw=";
vendorHash = "sha256-Y9YDwfubT+RR1v6BTFD+A8GP2ArQaIIoMJmak+Vcx88=";
ldflags = [
"-X code.gitea.io/tea/cmd.Version=${version}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tea \
--bash <($out/bin/tea completion bash) \
--fish <($out/bin/tea completion fish) \
--zsh <($out/bin/tea completion zsh)
mkdir $out/share/powershell/ -p
$out/bin/tea completion pwsh > $out/share/powershell/tea.Completion.ps1
$out/bin/tea man --out $out/share/man/man1/tea.1
'';
meta = with lib; {
description = "Gitea official CLI client";
@ -29,20 +48,4 @@ buildGoModule rec {
];
mainProgram = "tea";
};
ldflags = [
"-X code.gitea.io/tea/cmd.Version=${version}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd tea \
--bash <($out/bin/tea completion bash) \
--fish <($out/bin/tea completion fish) \
--zsh <($out/bin/tea completion zsh)
mkdir $out/share/powershell/ -p
$out/bin/tea completion pwsh > $out/share/powershell/tea.Completion.ps1
'';
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "testssl.sh";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
sha256 = "sha256-jVrEgTgAvu/N0Ijdl4Lya05Q/af7jGTlJBNiYt1X3tI=";
sha256 = "sha256-zPqGCcWRwTYl7cGnrv9a5KOMe75xzU2xvf5z+Nqwfb0=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -6,17 +6,17 @@
buildGo124Module rec {
pname = "vuls";
version = "0.33.4";
version = "0.34.0";
src = fetchFromGitHub {
owner = "future-architect";
repo = "vuls";
tag = "v${version}";
hash = "sha256-FPI62wuDcriNMCPkzEZXSlfpCwpQhw0QiZUAJ4OFgic=";
hash = "sha256-pmih1Nh5KESIrxmYuEku3lkG5oZvMNilzW77U2syExc=";
fetchSubmodules = true;
};
vendorHash = "sha256-OjE+j91QgS74FknfYLnkA7RKDSnC8yUZDIRXw3taORA=";
vendorHash = "sha256-4PbQvWS9IFkb9r+b92MJoSGxP4qDMQul4lGlaAEPP2k=";
ldflags = [
"-s"

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "vunnel";
version = "0.39.2";
version = "0.40.1";
pyproject = true;
src = fetchFromGitHub {
owner = "anchore";
repo = "vunnel";
tag = "v${version}";
hash = "sha256-7dguSGEDnshjBw6ImtteE39oLbbvsMdX9hz+wmOCcYU=";
hash = "sha256-rO8Qhd1PEDy01Ji8uhxr1oLGU+WyYxgw1sLNCt/gaak=";
leaveDotGit = true;
};

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waytrogen";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "nikolaizombie1";
repo = "waytrogen";
tag = finalAttrs.version;
hash = "sha256-vFzOGadWR5xwhIKrKPHoAHstoeyFw4GrS5aYlpvEF5E=";
hash = "sha256-I7juUTIN+ZhD9w2WXSU5YMBulxcGUYDdv6eiLZ1Byyw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wideriver";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "alex-courtis";
repo = "wideriver";
tag = finalAttrs.version;
hash = "sha256-1D06onZiR8H4OuwNTr7NBnD1H7zagFHYlAXFo5CfibI=";
hash = "sha256-HdmgTRIR5+mK3almk7kUZdSdJl9tHCDztlEqZ6MLVNI=";
};
nativeBuildInputs = [

View file

@ -20,6 +20,8 @@ let
"https://fsn1.your-objectstorage.com/simon-public/assets/sqlcipher/${version}.c";
})
{
v4_10_0 = "sha256-3njvCHy8Juj+WE3gXxeQ8+NIl9uHMegVTcZ00/LfKMs=";
v4_9_0 = "sha256-uqvW5BgMjCS0GzeEDeGskb4It0NkWjNUpyXpGlBSIlc=";
v4_8_0 = "sha256-nfYmi9PJlMbLqiFRksOIUXYHgD8LL2AVey9GCUc03Jw=";
v4_6_1 = "sha256-8kBJiy8g1odpBQQUF5A7f9g3+WStbJTARyfvAi84YVE=";
v4_5_7 = "sha256-lDgSEVGZcoruF7nAp0C2kr6TN7XllpMzMVi/R1XfGP4=";

View file

@ -126,6 +126,7 @@ let
aarch64-darwin = "./Configure darwin64-arm64-cc";
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
powerpc-linux = "./Configure linux-ppc";
powerpc64-linux = "./Configure linux-ppc64";
riscv32-linux = "./Configure ${
if lib.versionAtLeast version "3.2" then "linux32-riscv32" else "linux-latomic"

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.62.0";
version = "3.63.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
tag = version;
hash = "sha256-uvvv96ztvzCmXx63brvnoKcfXUsDgZA9cNeCB7jdawQ=";
hash = "sha256-ucVDjOV1NmHguwXSWbomNz9gjrxpeGmoZqF/Je6BL/4=";
};
build-system = [ setuptools ];

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "imgw-pib";
version = "1.5.4";
version = "1.5.6";
pyproject = true;
src = fetchFromGitHub {
owner = "bieniu";
repo = "imgw-pib";
tag = version;
hash = "sha256-IRT0tEVKQ1ebvRtBsdf30DII1U6vjV2/MTk7PoC9zd4=";
hash = "sha256-U1kC8+614U00LZbomx4bqf5pR/ZZDGx3u3bmUHZaDJ4=";
};
build-system = [ setuptools ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "influxdb3-python";
version = "0.15.0";
version = "0.16.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "InfluxCommunity";
repo = "influxdb3-python";
tag = "v${version}";
hash = "sha256-BbU/CeTlJHIoZBj+NCl9Cdag/6tTP3y6FFJMPiShRUA=";
hash = "sha256-o4w1+srucPlRq/NqICvdRNxmghxEBoXH05m3m0GQJFM=";
};
postPatch = ''

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "linode-api";
version = "5.34.0";
version = "5.35.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "linode";
repo = "python-linode-api";
tag = "v${version}";
hash = "sha256-yaItHYxO2+oMiqNAHJJG1B0VRHyKNvicupktihbTNr8=";
hash = "sha256-Ak92yjTDi8ql+Trzl4IRAn+DucRZsdHSK75RjFECcCY=";
};
build-system = [ setuptools ];

View file

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "mcpadapt";
version = "0.1.13";
version = "0.1.16";
pyproject = true;
src = fetchFromGitHub {
owner = "grll";
repo = "mcpadapt";
tag = "v${version}";
hash = "sha256-yz4fPywhlCu6DIhYoeaK/eAYjht8LCzx9ltX2XsIFxw=";
hash = "sha256-uhphBJ9gab/5i8rTnEzfhCm0caJ756XdGqJeHoHP0tM=";
};
build-system = [ hatchling ];

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mitogen";
version = "0.3.27";
version = "0.3.29";
pyproject = true;
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = "mitogen";
tag = "v${version}";
hash = "sha256-vW3OgVFu9xw45g9Idurb2feguH8AhY7qcWbF9nXjLLw=";
hash = "sha256-j2VT46bYi9lmFKNNCHshs56b2HqqvfpEDBHnaHvfYgY=";
};
build-system = [ setuptools ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "open-meteo";
version = "0.3.2";
version = "0.4.0";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-open-meteo";
rev = "v${version}";
hash = "sha256-PddQyCCYbI9DjTvlJ4F3IQB6VichwcNhC04DJMULYZM=";
hash = "sha256-J106XeSglyqrFfP1ckbnDwfE7IikaNiBQ+m14PE2SBc=";
};
postPatch = ''

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "parts";
version = "3.0.0";
version = "4.0.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-MuZDe/j04sE8tX6658zYwbebwGYp7r3wVBbumoBJ2WQ=";
hash = "sha256-uw/bo+Y24KIgKH+hfc4iUboH8jJKeaoQGHBv6KjZixU=";
};
build-system = [ setuptools ];

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.70.0";
version = "0.71.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
tag = version;
hash = "sha256-8W+RxehW68x3RULvKh+DkL/YH1usdmM8kOLEO579csE=";
hash = "sha256-MFWeU3KaCtEEvsNuSlLrWxZTYgER+/A6nF2yCvmGgTk=";
};
build-system = [ setuptools ];

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "3.14.0";
version = "3.14.1";
pyproject = true;
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "RapidFuzz";
tag = "v${version}";
hash = "sha256-KPVv4WU6MC17QDvcdpV86FH+FUcS8RMHxzmN/Gx2Cx8=";
hash = "sha256-p+Z2c+PBNdjfaRjZErWwWgihzuddV14PgTHE3NVNHs8=";
};
build-system = [

View file

@ -1,12 +1,12 @@
{
lib,
buildPythonPackage,
cryptography,
ecdsa,
fetchFromGitHub,
flask,
pytestCheckHook,
python-http-client,
pythonOlder,
pyyaml,
setuptools,
starkbank-ecdsa,
@ -15,21 +15,22 @@
buildPythonPackage rec {
pname = "sendgrid";
version = "6.12.4";
version = "6.12.5";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
tag = version;
hash = "sha256-TXFoNipUVaSvNquMy9xHHu0h5qxxvWTRw4JUK4acl3E=";
hash = "sha256-7r1FHcGmHRQK9mfpV3qcuZlIe7G6CIyarnpWLjduw4E=";
};
pythonRelaxDeps = [ "cryptography" ];
build-system = [ setuptools ];
dependencies = [
cryptography
ecdsa
python-http-client
starkbank-ecdsa
@ -54,7 +55,7 @@ buildPythonPackage rec {
description = "Python client for SendGrid";
homepage = "https://github.com/sendgrid/sendgrid-python";
changelog = "https://github.com/sendgrid/sendgrid-python/blob/${src.tag}/CHANGELOG.md";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "thermopro-ble";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = "thermopro-ble";
tag = "v${version}";
hash = "sha256-AlMwpDUFNz98KZRLi9TVqZ9sPXdLcVCvvVa0PXlv4q4=";
hash = "sha256-m4koagyGOOuwFCctQK1oz5riwCbrC0I8js+bnrHxwMY=";
};
build-system = [ poetry-core ];

View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "9.8.0";
version = "9.8.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
tag = version;
hash = "sha256-FXwrkUfdscFNBJrRhBxDotK3EbCAFON6tAkCS8/l+4w=";
hash = "sha256-zJiezLn2zEbSGPSRT4yNp7GaJnjArCo+QJDaGD0wyVM=";
};
build-system = [ setuptools ];

View file

@ -329,8 +329,8 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_9 = gen' {
version = "9.0.0";
hash = "sha256-j609eClspRgRPz0pAWYXx/k2fcAF+TK9nZO/RbpGBys=";
version = "9.1.0";
hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
defaultJava = jdk21;
};
gradle_8 = gen' {

View file

@ -1,12 +1,12 @@
{
"testing": {
"version": "6.17-rc5",
"hash": "sha256:14dvh8vbc3digvx96mhqnd4ijbxkhn1ph1nqkxlri3sff5z51k9x",
"version": "6.17-rc6",
"hash": "sha256:0biyp568nklgi11v00z2f48rwnj2hlshpldjxwn9bs91qlf1nlh4",
"lts": false
},
"6.1": {
"version": "6.1.152",
"hash": "sha256:1ndpnlmpsp2137aqis8bpa2cvdl28jg66pi0p2c6d26cm7i3n5qs",
"version": "6.1.153",
"hash": "sha256:0j4yzkhkbcsa9pgwcyqyfxi73avi7m0hd6xfaql73zwrb3hbvsvn",
"lts": true
},
"5.15": {
@ -25,18 +25,18 @@
"lts": true
},
"6.6": {
"version": "6.6.106",
"hash": "sha256:18584vys8qmbqj4hndiyhwbsn6z3832djm1mx07vgl6wv3i80c8c",
"version": "6.6.107",
"hash": "sha256:0iz4kvnsvs5fx9m2zm93xla2pkr0hqqyahm5d6f7p1n7scbk1dy9",
"lts": true
},
"6.12": {
"version": "6.12.47",
"hash": "sha256:099fj9qd8knafbl400drm8aqn5h7y6g39gc7d4i4hc3lf44f8bz8",
"version": "6.12.48",
"hash": "sha256:1chx8ycj609pdpnkhl3d6dsimd4q49vkqdiqisbligsicxkypyav",
"lts": true
},
"6.16": {
"version": "6.16.7",
"hash": "sha256:108sk9r6ac0sc7h6ydvlyv7kib6z3af4v2f46kdinys2z6hxmqsv",
"version": "6.16.8",
"hash": "sha256:17x6pylbrbh4fyk088gvhbd3gy3gpr1vn9jdjhlk3p44f2yi24r3",
"lts": false
}
}

View file

@ -47,7 +47,7 @@ while IFS= read -r url; do
fi
done < <(echo "$RELEASE_URLS" | jq -r)
echo "Updating Xanmod \"$VARIANT\" from $OLD_VERSION to $NEW_VERSION ($SUFFIX)"
>&2 echo "Updating Xanmod \"$VARIANT\" from $OLD_VERSION to $NEW_VERSION ($SUFFIX)"
URL="https://gitlab.com/api/v4/projects/xanmod%2Flinux/repository/archive.tar.gz?sha=$NEW_VERSION-$SUFFIX"
HASH="$(nix-prefetch fetchzip --quiet --url "$URL")"
@ -87,3 +87,12 @@ update_variant() {
}
update_variant "$FILE_PATH" "$VARIANT" "$NEW_VERSION" "$HASH" "$SUFFIX"
# Customize commit
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#supported-features
COMMIT_BODY="
- Changelog: https://dl.xanmod.org/changelog/${NEW_VERSION%.*}/ChangeLog-$NEW_VERSION-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/$OLD_VERSION-xanmod1..$NEW_VERSION-xanmod1?from_project_id=51590166
"
jq -n --arg commitBody "$COMMIT_BODY" '[$ARGS.named]'

View file

@ -74,10 +74,16 @@ let
RCU_EXP_KTHREAD = yes;
};
extraPassthru.updateScript = [
./update-xanmod.sh
variant
];
extraPassthru.updateScript = {
command = [
./update-xanmod.sh
variant
];
supportedFeatures = [
"commit"
];
};
inherit isLTS;
extraMeta = {

View file

@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
@ -62,6 +63,11 @@ buildPythonPackage rec {
"intents/tests"
];
disabledTests = lib.optionals stdenv.hostPlatform.isx86_64 [
# assert 100 == -100.0
"test_HassLightSet_name_brightness"
];
meta = with lib; {
changelog = "https://github.com/OHF-Voice/intents-package/releases/tag/${src.tag}";
description = "Intents to be used with Home Assistant";

View file

@ -59,14 +59,14 @@ let
in
{
nextcloud30 = generic {
version = "30.0.14";
hash = "sha256-LUT1nji4UE/98GhY9I+yVboTqsJONVzfR6Q+qiLY0EE=";
version = "30.0.15";
hash = "sha256-8zVS0xhel60aX+V6Sf4rVaNh3I5Pkl+xK1kgR9Hw5qU=";
packages = nextcloud30Packages;
};
nextcloud31 = generic {
version = "31.0.8";
hash = "sha256-YhF9t4P+d1Z3zotoD0tIwTuVkWV/7TtQi9w6MrQRXLA=";
version = "31.0.9";
hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
packages = nextcloud31Packages;
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -26,6 +26,7 @@ assert lib.assertMsg (
boehmgc,
boost,
brotli,
busybox,
busybox-sandbox-shell,
bzip2,
callPackage,
@ -140,10 +141,8 @@ stdenv.mkDerivation (finalAttrs: {
# python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
(buildPackages.python3.withPackages (
p:
[
p.python-frontmatter
p.toml
]
[ p.python-frontmatter ]
++ lib.optionals (lib.versionOlder version "2.94") [ p.toml ]
++ lib.optionals finalAttrs.doInstallCheck [
p.aiohttp
p.pytest
@ -203,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals hasExternalLixDoc [ lix-doc ]
++ lib.optionals (!isLegacyParser) [ pegtl ]
++ lib.optionals (lib.versionOlder version "2.94") [ libsodium ]
# NOTE(Raito): I'd have expected that the LLVM packaging would inject the
# libunwind library path directly in the wrappers, but it does inject
# -lunwind without injecting the library path...
@ -286,7 +286,13 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isLinux [
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
];
]
++
lib.optionals
(stdenv.hostPlatform.isLinux && finalAttrs.doInstallCheck && lib.versionAtLeast version "2.94")
[
(lib.mesonOption "build-test-shell" "${busybox}/bin")
];
ninjaFlags = [ "-v" ];

View file

@ -208,16 +208,23 @@ lib.makeExtensible (
attrName = "git";
lix-args = rec {
version = "2.94.0-pre-20250807_${builtins.substring 0 12 src.rev}";
version = "2.94.0-pre-20250912_${builtins.substring 0 12 src.rev}";
src = fetchFromGitea {
domain = "git.lix.systems";
owner = "lix-project";
repo = "lix";
rev = "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb";
hash = "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=";
rev = "d90e4a65812c6d3dd90aed7e44941eba3215f876";
hash = "sha256-rbf0ptj4BTSwsitKQu3FuaiJwhNDePGBeBJovm5HLdQ=";
};
patches = [
# Bumping to toml11 ≥4.0.0 makes integer parsing throw (as it should) instead of saturate on overflow.
# However, the updated version is not in nixpkgs yet, and the released versions still have the saturation bug.
# Hence reverting the bump for now seems to be the least bad option.
./revert-toml11-bump.patch
];
cargoDeps = rustPlatform.fetchCargoVendor {
name = "lix-${version}";
inherit src;

View file

@ -0,0 +1,192 @@
diff --git a/doc/manual/rl-next/toml-number-overflow.md b/doc/manual/rl-next/toml-number-overflow.md
deleted file mode 100644
index 1522213cb4..0000000000
--- a/doc/manual/rl-next/toml-number-overflow.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-synopsis: Reject overflowing TOML integer literals
-issues: []
-cls: [3916]
-category: "Breaking Changes"
-credits: [emilazy]
----
-
-The toml11 library used by Lix was updated. The new
-version aligns with the [TOML v1.0.0 specifications
-requirement](https://toml.io/en/v1.0.0#integer) to reject integer
-literals that cannot be losslessly parsed. This means that code like
-`builtins.fromTOML "v=0x8000000000000000"` will now produce an error
-rather than silently saturating the integer result.
diff --git a/lix/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc
index 9d4b5e6abf..3e26773eac 100644
--- a/lix/libexpr/primops/fromTOML.cc
+++ b/lix/libexpr/primops/fromTOML.cc
@@ -65,10 +65,13 @@
val,
toml::parse(
tomlStream,
- "fromTOML", /* the "filename" */
+ "fromTOML" /* the "filename" */
+#if HAVE_TOML11_4
+ ,
toml::spec::v(
1, 0, 0
) // Be explicit that we are parsing TOML 1.0.0 without extensions
+#endif
)
);
} catch (std::exception & e) { // NOLINT(lix-foreign-exceptions) // TODO: toml::syntax_error
diff --git a/meson.build b/meson.build
index 7b229ccefb..d4a36eb285 100644
--- a/meson.build
+++ b/meson.build
@@ -363,7 +363,10 @@
dependency('gmock_main', required : enable_tests, include_type : 'system'),
]
-toml11 = dependency('toml11', version : '>=4.0.0', required : true, method : 'cmake', include_type : 'system')
+toml11 = dependency('toml11', version : '>=3.7.0', required : true, method : 'cmake', include_type : 'system')
+configdata += {
+ 'HAVE_TOML11_4': toml11.version().version_compare('>= 4.0.0').to_int(),
+}
pegtl = dependency(
'pegtl',
diff --git a/misc/toml11.nix b/misc/toml11.nix
deleted file mode 100644
index c53be3da1b..0000000000
--- a/misc/toml11.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- cmake,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "toml11";
- version = "4.4.0";
-
- src = fetchFromGitHub {
- owner = "ToruNiina";
- repo = "toml11";
- rev = "v${finalAttrs.version}";
- hash = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ=";
- };
-
- nativeBuildInputs = [
- cmake
- ];
-
- meta = with lib; {
- homepage = "https://github.com/ToruNiina/toml11";
- description = "TOML for Modern C++";
- longDescription = ''
- toml11 is a C++11 (or later) header-only toml parser/encoder depending
- only on C++ standard library.
-
- - It is compatible to the latest version of TOML v1.0.0.
- - It is one of the most TOML standard compliant libraries, tested with
- the language agnostic test suite for TOML parsers by BurntSushi.
- - It shows highly informative error messages.
- - It has configurable container. You can use any random-access containers
- and key-value maps as backend containers.
- - It optionally preserves comments without any overhead.
- - It has configurable serializer that supports comments, inline tables,
- literal strings and multiline strings.
- - It supports user-defined type conversion from/into toml values.
- - It correctly handles UTF-8 sequences, with or without BOM, both on posix
- and Windows.
- '';
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- platforms = platforms.unix ++ platforms.windows;
- };
-})
diff --git a/package.nix b/package.nix
index eb0e5c602a..c1c948ee7e 100644
--- a/package.nix
+++ b/package.nix
@@ -55,8 +55,6 @@
rustc,
sqlite,
systemtap-lix ? __forDefaults.systemtap-lix,
- # FIXME: remove default after dropping NixOS 25.05
- toml11-lix ? __forDefaults.toml11-lix,
toml11,
util-linuxMinimal ? utillinuxMinimal,
utillinuxMinimal ? null,
@@ -117,9 +115,6 @@
build-release-notes = callPackage ./maintainers/build-release-notes.nix { };
passt-lix = callPackage ./misc/passt.nix { };
-
- toml11-lix =
- if lib.versionOlder toml11.version "4.4.0" then callPackage ./misc/toml11.nix { } else toml11;
},
}:
@@ -344,7 +339,7 @@
libarchive
boost
lowdown
- toml11-lix
+ toml11
pegtl
capnproto
dtrace-headers
diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp b/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp
deleted file mode 100644
index 0c90e85edf..0000000000
--- a/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-error:
- … while calling the 'fromTOML' builtin
- at /pwd/in.nix:1:1:
- 1| builtins.fromTOML ''attr = 9223372036854775808''
- | ^
- 2|
-
- error: while parsing TOML: [error] toml::parse_dec_integer: too large integer: current max digits = 2^63
- --> fromTOML
- |
- 1 | attr = 9223372036854775808
- | ^-- must be < 2^63
-
diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp b/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp
deleted file mode 100644
index a287e18655..0000000000
--- a/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-error:
- … while calling the 'fromTOML' builtin
- at /pwd/in.nix:1:1:
- 1| builtins.fromTOML ''attr = -9223372036854775809''
- | ^
- 2|
-
- error: while parsing TOML: [error] toml::parse_dec_integer: too large integer: current max digits = 2^63
- --> fromTOML
- |
- 1 | attr = -9223372036854775809
- | ^-- must be < 2^63
-
diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-okay-overflow.out.exp b/tests/functional2/lang/fromTOML-overflowing/eval-okay-overflow.out.exp
new file mode 100644
index 0000000000..e241ca9ba4
--- /dev/null
+++ b/tests/functional2/lang/fromTOML-overflowing/eval-okay-overflow.out.exp
@@ -0,0 +1,1 @@
+{ attr = 9223372036854775807; }
diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-okay-underflow.out.exp b/tests/functional2/lang/fromTOML-overflowing/eval-okay-underflow.out.exp
new file mode 100644
index 0000000000..83b822591f
--- /dev/null
+++ b/tests/functional2/lang/fromTOML-overflowing/eval-okay-underflow.out.exp
@@ -0,0 +1,1 @@
+{ attr = -9223372036854775808; }

View file

@ -14788,12 +14788,11 @@ with pkgs;
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
inherit (callPackage ../applications/networking/cluster/kops { })
mkKops
kops_1_27
kops_1_28
kops_1_29
kops_1_30
kops_1_31
kops_1_32
kops_1_33
;
kops = kops_1_29;
kops = kops_1_33;
lilypond = callPackage ../misc/lilypond { };