From e7572dfb7471d157e265340260e289a618f5aaa2 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 19:30:12 +0200 Subject: [PATCH 01/59] genemichaels: switch to fetchCrate This way we can avoid tests failing due to unstable libraries in the workspace (they'll be replaced by stable versions from Crates) --- pkgs/by-name/ge/genemichaels/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 0dbbe783edab..63b1d44e0846 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -1,28 +1,19 @@ { lib, rustPlatform, - fetchFromGitHub, + fetchCrate, }: rustPlatform.buildRustPackage rec { pname = "genemichaels"; version = "0.5.13"; - src = fetchFromGitHub { - owner = "andrewbaxter"; - repo = "genemichaels"; - rev = "genemichaels-v${version}"; - hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ="; + src = fetchCrate { + inherit pname version; + hash = "sha256-ZJr5cN+Bam71fPDwhcYUVop5JW8145tzY7Sk75fjhvQ="; }; - cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM="; - - cargoBuildFlags = [ "--package ${pname}" ]; - # cargoTestFlags is not used because genemichaels is tightly coupled to the - # other crates in the workspace and by not setting it, we run all the tests. - # If a dependency crate is failing its tests, we want to know about it. For - # example, between versions 0.5.8 and 0.5.12, there was a failing test in one - # of the other workspace members that genemichaels depends on. + cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; meta = { description = "Even formats macros"; From 1ed025fe46f6618d49d1c6f7bb79bdd3db17d817 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 20:14:28 +0200 Subject: [PATCH 02/59] genemichaels: add updateScript --- pkgs/by-name/ge/genemichaels/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 63b1d44e0846..5759076c2bd5 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; + passthru.updateScript = nix-update-script { }; + meta = { description = "Even formats macros"; homepage = "https://github.com/andrewbaxter/genemichaels"; From 842cff02d8e9c480e4e1fb616c2ce30ef738d49e Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 18:15:16 +0000 Subject: [PATCH 03/59] genemichaels: 0.5.13 -> 0.8.5 --- pkgs/by-name/ge/genemichaels/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 5759076c2bd5..9e3e21c6dae5 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "genemichaels"; - version = "0.5.13"; + version = "0.8.5"; src = fetchCrate { inherit pname version; - hash = "sha256-ZJr5cN+Bam71fPDwhcYUVop5JW8145tzY7Sk75fjhvQ="; + hash = "sha256-5cM5VyS5w92CjP3nVumuUNkCFlhipukRhM8ERhE36n4="; }; - cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; + cargoHash = "sha256-aJDtXsGVUxUrh3yLWEcobvFUqy/7PGFQHWIWU54zYdE="; passthru.updateScript = nix-update-script { }; From 2d7f45bfb7b55d3d3b65b47399208148de086937 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 16 Nov 2025 23:40:28 +0800 Subject: [PATCH 04/59] psst: 0-unstable-2025-04-20 -> 0-unstable-2025-11-16 --- pkgs/by-name/ps/psst/make-build-reproducible.patch | 8 ++++---- pkgs/by-name/ps/psst/package.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ps/psst/make-build-reproducible.patch b/pkgs/by-name/ps/psst/make-build-reproducible.patch index 51c13958a58c..17a7e2f1095c 100644 --- a/pkgs/by-name/ps/psst/make-build-reproducible.patch +++ b/pkgs/by-name/ps/psst/make-build-reproducible.patch @@ -10,11 +10,11 @@ index 4e899af..0000000 - -fn main() { - let outdir = env::var("OUT_DIR").unwrap(); -- let outfile = format!("{}/build-time.txt", outdir); +- let outfile = format!("{outdir}/build-time.txt"); - - let mut fh = fs::File::create(outfile).unwrap(); - let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); -- write!(fh, r#""{}""#, now).ok(); +- write!(fh, r#""{now}""#).ok(); - - let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!"); - // Get Git's 'Origin' URL @@ -43,9 +43,9 @@ index 4e899af..0000000 - let trimmed_url = remote_url.trim_end_matches(".git"); - remote_url.clone_from(&String::from(trimmed_url)); - -- let outfile = format!("{}/remote-url.txt", outdir); +- let outfile = format!("{outdir}/remote-url.txt"); - let mut file = fs::File::create(outfile).unwrap(); -- write!(file, r#""{}""#, remote_url).ok(); +- write!(file, r#""{remote_url}""#).ok(); -} diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs index 2faa317..b890a2d 100644 diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix index 836c58053e58..cb051dd9c29a 100644 --- a/pkgs/by-name/ps/psst/package.nix +++ b/pkgs/by-name/ps/psst/package.nix @@ -33,16 +33,16 @@ let in rustPlatform.buildRustPackage { pname = "psst"; - version = "0-unstable-2025-04-20"; + version = "0-unstable-2025-11-16"; src = fetchFromGitHub { owner = "jpochyla"; repo = "psst"; - rev = "86169f8b05c1b3502261cfe1fae9af2487b8f1bb"; - hash = "sha256-BkGoaYflCTiElTj47r2j/ngUrZ9wIe0q4pl+zhoattA="; + rev = "cae05c43f4aee2c5936375225c4586ea35594835"; + hash = "sha256-iCm5lvZq64Dmbe/stkZO0XvX0mWfmzFgl3MeCTI6/hM="; }; - cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw="; + cargoHash = "sha256-Q4xMsX6lJK3Or+oKuPOTCec2pe+oBWC33peCE1x7QRg="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; From 7a9fddc571050d80a9db9c909fe6a0193a2dc695 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 26 Nov 2025 23:17:46 +0100 Subject: [PATCH 05/59] nixos/k3s: make auto-deploy-charts test standalone Instead of using a prepared helm chart from the tests directory, the test now builds the helm chart on its own. --- nixos/tests/k3s/auto-deploy-charts.nix | 50 ++++++++++++++++++- nixos/tests/k3s/k3s-test-chart/Chart.yaml | 24 --------- .../k3s/k3s-test-chart/templates/job.yaml | 14 ------ nixos/tests/k3s/k3s-test-chart/values.yaml | 5 -- 4 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 nixos/tests/k3s/k3s-test-chart/Chart.yaml delete mode 100644 nixos/tests/k3s/k3s-test-chart/templates/job.yaml delete mode 100644 nixos/tests/k3s/k3s-test-chart/values.yaml diff --git a/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix index 133189f1e769..b5d1a31f3c60 100644 --- a/nixos/tests/k3s/auto-deploy-charts.nix +++ b/nixos/tests/k3s/auto-deploy-charts.nix @@ -27,9 +27,57 @@ import ../make-test-python.nix ( pkgs.runCommand "k3s-test-chart.tgz" { nativeBuildInputs = [ pkgs.kubernetes-helm ]; + chart = builtins.toJSON { + name = "k3s-test-chart"; + version = "0.1.0"; + }; + values = builtins.toJSON { + restartPolicy = "Never"; + runCommand = ""; + image = { + repository = "foo"; + tag = "1.0.0"; + }; + }; + job = builtins.toJSON { + apiVersion = "batch/v1"; + kind = "Job"; + metadata = { + name = "{{ .Release.Name }}"; + namespace = "{{ .Release.Namespace }}"; + }; + spec = { + template = { + spec = { + containers = [ + { + name = "test"; + image = "{{ .Values.image.repository }}:{{ .Values.image.tag }}"; + command = [ "sh" ]; + args = [ + "-c" + "{{ .Values.runCommand }}" + ]; + } + ]; + restartPolicy = "{{ .Values.restartPolicy }}"; + }; + }; + }; + }; + passAsFile = [ + "values" + "chart" + "job" + ]; } '' - helm package ${./k3s-test-chart} + mkdir -p chart/templates + cp "$chartPath" chart/Chart.yaml + cp "$valuesPath" chart/values.yaml + cp "$jobPath" chart/templates/job.json + + helm package chart mv ./*.tgz $out ''; # The common Helm chart that is used in this test diff --git a/nixos/tests/k3s/k3s-test-chart/Chart.yaml b/nixos/tests/k3s/k3s-test-chart/Chart.yaml deleted file mode 100644 index 9cc0ae87678f..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: k3s-test-chart -description: A Helm chart that is used in k3s NixOS tests. - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" diff --git a/nixos/tests/k3s/k3s-test-chart/templates/job.yaml b/nixos/tests/k3s/k3s-test-chart/templates/job.yaml deleted file mode 100644 index 029453e56219..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/templates/job.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ .Release.Name | quote }} - namespace: {{ .Release.Namespace | quote }} -spec: - template: - spec: - containers: - - name: test - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - command: ["sh"] - args: ["-c", "{{ .Values.runCommand }}"] - restartPolicy: {{ .Values.restartPolicy | quote }} diff --git a/nixos/tests/k3s/k3s-test-chart/values.yaml b/nixos/tests/k3s/k3s-test-chart/values.yaml deleted file mode 100644 index cca4a557fd90..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/values.yaml +++ /dev/null @@ -1,5 +0,0 @@ -restartPolicy: "Never" -runCommand: "" -image: - repository: foo - tag: 1.0.0 From 788d0991a6c5ec5ae29863615e9e94f87352d957 Mon Sep 17 00:00:00 2001 From: midischwarz12 Date: Sun, 30 Nov 2025 01:02:09 +0000 Subject: [PATCH 06/59] nh,nh-unwrapped: add midischwarz12 maintainer --- pkgs/by-name/nh/nh-unwrapped/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 862d32fd7960..7f1ab2a2f226 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ NotAShelf viperML + midischwarz12 ]; }; }) From 24696305aa507acb182bc40e20916968f76c3f5e Mon Sep 17 00:00:00 2001 From: midischwarz12 Date: Sun, 30 Nov 2025 01:02:09 +0000 Subject: [PATCH 07/59] nh: meta rewrite - use a consistent meta.priority default - prevent hydra build --- pkgs/by-name/nh/nh/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 29032d5ce713..924c613dbc8b 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -13,7 +13,7 @@ let in symlinkJoin { pname = "nh"; - inherit (unwrapped) version meta; + inherit (unwrapped) version; paths = [ unwrapped @@ -27,4 +27,20 @@ symlinkJoin { wrapProgram $out/bin/nh \ --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; + + meta = { + inherit (unwrapped.meta) + changelog + description + homepage + license + mainProgram + maintainers + ; + + # To prevent builds on hydra + hydraPlatforms = [ ]; + # prefer wrapper over the package + priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1; + }; } From 4f09adac10d6690e039c90b19f45b125ed3bcc80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Dec 2025 09:38:11 +0000 Subject: [PATCH 08/59] keymapper: 5.1.0 -> 5.3.1 --- pkgs/by-name/ke/keymapper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index 6c94a4dce3bf..6db4e03ef204 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "5.1.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; tag = finalAttrs.version; - hash = "sha256-y1EVF3IwGzDy32ywo9LSzkQNki/HuKC40DySIme8nTc="; + hash = "sha256-YKfKgsrjDrskLEoYCSRMYco7+7E/sgXFAMEwwm7rs7w="; }; # all the following must be in nativeBuildInputs From 8fe573fc666f9203386c75beedf894db82f6bf63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Dec 2025 04:05:28 +0000 Subject: [PATCH 09/59] algia: 0.0.91 -> 0.0.93 --- pkgs/by-name/al/algia/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 96b85e6e3334..9737d8d35ecd 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "algia"; - version = "0.0.91"; + version = "0.0.93"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${version}"; - hash = "sha256-VsQBiD8OE2NHwMlYrCG43ukuBHE0bkKFt4BxsNUvLAo="; + hash = "sha256-B1win7mTU1vrdhhm8jtbemVYwUWYlEpoLN4d4FI65Is="; }; - vendorHash = "sha256-kp52vbvE6QY0SEY/2D1f1EbDzqweQkNOepN0We4I9ko="; + vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; meta = { description = "CLI application for nostr"; From 3f1a27aaefe8d34de58603a1ab8a50c188888f7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 01:51:55 +0000 Subject: [PATCH 10/59] proton-ge-bin: GE-Proton10-25 -> GE-Proton10-26 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 7c9edd97cee6..a00ccd3dc2f8 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-25"; + version = "GE-Proton10-26"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k="; + hash = "sha256-Q5bKTDn3sTgp4mbsevOdN3kcdRsyKylghXqM2I2cYq8="; }; dontUnpack = true; From 953a0196043abb7bec8172d41500b204996e86f9 Mon Sep 17 00:00:00 2001 From: Stzx Date: Mon, 8 Dec 2025 10:31:58 +0800 Subject: [PATCH 11/59] linux_xanmod: 6.12.60 -> 6.12.61 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.61-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.60-xanmod1..6.12.61-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 1afc37b6279f..3c0f0d8a5b98 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.60"; - hash = "sha256-nS9vsdH76q+uUaWXEp3duikX7osVqv7hjBMFNzdtA7o="; + version = "6.12.61"; + hash = "sha256-7m4Ehmy463rQK265fEvTMjndqZXs+PJ35HE+tZVKgGQ="; isLTS = true; }; # ./update-xanmod.sh main From 93408472fca872467911e27ee8f88a521b975311 Mon Sep 17 00:00:00 2001 From: Stzx Date: Mon, 8 Dec 2025 10:37:34 +0800 Subject: [PATCH 12/59] linux_xanmod_latest: 6.17.10 -> 6.17.11 - Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.11-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.10-xanmod1..6.17.11-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3c0f0d8a5b98..f1737bdb50e0 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.17.10"; - hash = "sha256-Y6WsimtxzT6SutR040tUK+fVNnxnACtiyA3DF+iiPVM="; + version = "6.17.11"; + hash = "sha256-NJQ67MOjFMScwECxQd00F3SZ+kITbuBp/3imNXdUqlQ="; }; }; From 26ad20af4aa96288f5806fa0166344503f9b8f90 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 8 Dec 2025 12:59:37 +0200 Subject: [PATCH 13/59] python3Packages.kbnf: init at 0.4.2 --- .../python-modules/kbnf/Cargo.lock | 1254 +++++++++++++++++ .../python-modules/kbnf/default.nix | 63 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 1319 insertions(+) create mode 100644 pkgs/development/python-modules/kbnf/Cargo.lock create mode 100644 pkgs/development/python-modules/kbnf/default.nix diff --git a/pkgs/development/python-modules/kbnf/Cargo.lock b/pkgs/development/python-modules/kbnf/Cargo.lock new file mode 100644 index 000000000000..b6a8bd49edf6 --- /dev/null +++ b/pkgs/development/python-modules/kbnf/Cargo.lock @@ -0,0 +1,1254 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.3", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "windows-sys", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "fixedbitset-stack" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d498da3487b4ea426e370276db9e93c29624b667855b415ccd01da983dd1237" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "general-sam" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5707ba8f51753f8c456213beb1aee9cda85c290368ad013939fbebcf393610a" + +[[package]] +name = "generic-array" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c8444bc9d71b935156cc0ccab7f622180808af7867b1daae6547d773591703" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "half" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +dependencies = [ + "foldhash", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + +[[package]] +name = "insta" +version = "1.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371" +dependencies = [ + "console", + "once_cell", + "similar", +] + +[[package]] +name = "inventory" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83" +dependencies = [ + "rustversion", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jaggedarray" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18d4d488e472f5e805edd8d7e710c255ff19511e3f5fbb0932932bee0e804d5" +dependencies = [ + "generic-array", + "num", + "tinyvec", + "typenum", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "kbnf" +version = "0.5.7" +dependencies = [ + "ahash", + "criterion", + "displaydoc", + "fixedbitset-stack", + "general-sam", + "getrandom 0.2.16", + "insta", + "jaggedarray", + "js-sys", + "kbnf-regex-automata", + "kbnf-syntax", + "log", + "mimalloc", + "nom", + "nonmax", + "num", + "pyo3", + "pyo3-log", + "serde", + "serde-wasm-bindgen", + "serde_json", + "string-interner", + "strum", + "thiserror 2.0.12", + "tinyvec", + "wasm-bindgen", +] + +[[package]] +name = "kbnf-regex-automata" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a900e0a0e795744f6b18fe493500a1d773633972251f84f4be909edfb0d0f2" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "kbnf-syntax" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be809205c11efacf850d7ff585bd346d7d40dceb272f4846294b14d4c3c33995" +dependencies = [ + "general-sam", + "kbnf-regex-automata", + "nom", + "parse-hyperlinks", + "regex-lite", + "regex-syntax", + "rustc-hash", + "serde", + "string-interner", + "thiserror 2.0.12", + "unescaper", +] + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] +name = "parse-hyperlinks" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ac700657cc7a89620d1c28b310d594ff0491c11fd3dd1ae748ed5c5c8640e6" +dependencies = [ + "html-escape", + "nom", + "percent-encoding", + "thiserror 1.0.69", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +dependencies = [ + "cfg-if", + "indoc", + "inventory", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45192e5e4a4d2505587e27806c7b710c231c40c56f3bfc19535d0bb25df52264" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustversion" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "similar" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" + +[[package]] +name = "string-interner" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a3275464d7a9f2d4cac57c89c2ef96a8524dba2864c8d6f82e3980baf136f9b" +dependencies = [ + "hashbrown", + "serde", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + +[[package]] +name = "unescaper" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01d12e3a56a4432a8b436f293c25f4808bdf9e9f9f98f9260bba1f1bc5a1f26" +dependencies = [ + "thiserror 2.0.12", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/kbnf/default.nix b/pkgs/development/python-modules/kbnf/default.nix new file mode 100644 index 000000000000..fa60abf8505c --- /dev/null +++ b/pkgs/development/python-modules/kbnf/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + numpy, + triton, + torch, +}: + +buildPythonPackage rec { + pname = "kbnf"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dan-wanna-M"; + repo = "kbnf"; + rev = "v${version}-python"; + hash = "sha256-reefuqS0eExky9qtxBTqwxnZgK8AWFfkrN+VL/lFLyg="; + }; + + # Manually unarchived from tarball from pypi + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + dependencies = [ + numpy + ]; + + optional-dependencies = { + efficient_logits_mask = [ + triton + ]; + torch = [ + torch + ]; + }; + + pythonImportsCheck = [ + "kbnf" + ]; + + meta = { + description = "Fast constrained decoding engine based on context free grammar"; + homepage = "https://pypi.org/project/kbnf/"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb44f2fd32d3..339343ae94b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7956,6 +7956,8 @@ self: super: with self; { kbcstorage = callPackage ../development/python-modules/kbcstorage { }; + kbnf = callPackage ../development/python-modules/kbnf { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { }; From e650696798582c878a9c3a12a4137cedc741d041 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 8 Dec 2025 13:00:53 +0200 Subject: [PATCH 14/59] python3Packages.general-sam: init at 1.0.3 --- .../python-modules/general-sam/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/general-sam/default.nix diff --git a/pkgs/development/python-modules/general-sam/default.nix b/pkgs/development/python-modules/general-sam/default.nix new file mode 100644 index 000000000000..9611dfaf988d --- /dev/null +++ b/pkgs/development/python-modules/general-sam/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + cargo, + rustc, +}: + +buildPythonPackage rec { + pname = "general-sam"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ModelTC"; + repo = "general-sam-py"; + rev = "v${version}"; + hash = "sha256-++6Z9Ocee4QFN1u0nK/g9uGdmB1UYnfHhhJj74zboCE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-8HHIM1Abz5KxnVphFFNJp6L3D6iPeoB7qVmxy11CUZs="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + optional-dependencies = { + test = [ + pytest + ]; + }; + + pythonImportsCheck = [ + "general_sam" + ]; + + meta = { + description = "General suffix automaton implementation"; + homepage = "https://github.com/ModelTC/general-sam-py"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 339343ae94b1..7dd1a1032a10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5913,6 +5913,8 @@ self: super: with self; { genanki = callPackage ../development/python-modules/genanki { }; + general-sam = callPackage ../development/python-modules/general-sam { }; + generic = callPackage ../development/python-modules/generic { }; genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { }; From 026d5656eef79bbfc2a9b9301798fd6924bdd92a Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 8 Dec 2025 13:01:58 +0200 Subject: [PATCH 15/59] python3Packages.formatron: init at 0.5.0 --- .../python-modules/formatron/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/formatron/default.nix diff --git a/pkgs/development/python-modules/formatron/default.nix b/pkgs/development/python-modules/formatron/default.nix new file mode 100644 index 000000000000..0353fc4d7b8b --- /dev/null +++ b/pkgs/development/python-modules/formatron/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + general-sam, + setuptools, + kbnf, + frozendict, + jsonschema, + pydantic, + transformers, + vllm, +}: +buildPythonPackage rec { + pname = "formatron"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dan-wanna-M"; + repo = "formatron"; + rev = "v${version}"; + hash = "sha256-LQJza8F5wPcQO1y7Ino4slv7zoJMsZBn4LKLWYO9818="; + fetchSubmodules = true; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + frozendict + general-sam + jsonschema + kbnf + pydantic + ]; + + optional-dependencies = { + transformers = [ + transformers + ]; + vllm = [ + vllm + ]; + }; + + pythonImportsCheck = [ + "formatron" + ]; + + meta = { + description = "Control the output format of language models"; + homepage = "https://github.com/Dan-wanna-M/formatron"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7dd1a1032a10..ae107ab0399e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5685,6 +5685,8 @@ self: super: with self; { forecast-solar = callPackage ../development/python-modules/forecast-solar { }; + formatron = callPackage ../development/python-modules/formatron { }; + formbox = callPackage ../development/python-modules/formbox { }; formencode = callPackage ../development/python-modules/formencode { }; From 82ff6249cf45e0756e3f3d89abf36416d8e0a5a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 13:51:16 +0000 Subject: [PATCH 16/59] infrastructure-agent: 1.71.1 -> 1.71.2 --- pkgs/by-name/in/infrastructure-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index d49b97a6b256..da2cc5032946 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.71.1"; + version = "1.71.2"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-HS6OgPi6gF1LB7BgFeLL3Wpvwu7sv9YoR3VBytLrd0Y="; + hash = "sha256-DnS6C2Fiah1jaInX2xS3R0UKrHa0IAagKOPB0QBCR5Y="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; From b9262187965de63a728f3d695212a9f4cbc38872 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 15:47:45 +0000 Subject: [PATCH 17/59] python3Packages.timetagger: 25.06.1 -> 25.12.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index af3444f39a1d..83e75a5e419d 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "timetagger"; - version = "25.06.1"; + version = "25.12.1"; pyproject = true; src = fetchFromGitHub { owner = "almarklein"; repo = "timetagger"; tag = "v${version}"; - hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0="; + hash = "sha256-XuYxle5U5Ui8ITsCgiJjwaRdfHwEa9cF0lAMoXwJamw="; }; build-system = [ setuptools ]; From c1c5111dbff80ca622d7114421f71fbc75ba5f16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 16:30:09 +0000 Subject: [PATCH 18/59] libretranslate: 1.8.1 -> 1.8.3 --- pkgs/development/python-modules/libretranslate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index bb5e7c6e50f2..f6961d33b45a 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.8.1"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-LzXAGiZQU6wV063bqLTr8S1IDX/j4xHjqmhuFyosCSw="; + hash = "sha256-nWm0h/ceGDtoUVqYPkIC+anXrneJsxlZ4DN3Wge0NCk="; }; build-system = [ From 2450b2cfb0393676834deaa21c7efe354d641037 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 18:28:25 +0000 Subject: [PATCH 19/59] watcher: 0.13.8 -> 0.14.1 --- pkgs/by-name/wa/watcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/watcher/package.nix b/pkgs/by-name/wa/watcher/package.nix index 419b49a9776f..78d08eb9dbde 100644 --- a/pkgs/by-name/wa/watcher/package.nix +++ b/pkgs/by-name/wa/watcher/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "watcher"; - version = "0.13.8"; + version = "0.14.1"; src = fetchFromGitHub { owner = "e-dant"; repo = "watcher"; tag = version; - hash = "sha256-sQel+W9J8ExWkSEYd6Wjw2M9VgTIax+8zadI982fH4U="; + hash = "sha256-Rqsm6DBS8SHxibQvrwO30RZ5ZPLWQvdTOM7i2zzCPXc="; }; nativeBuildInputs = [ From 7be46cbf0f77e3364424c5e04fde3169ddd0c1d2 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:47 +0800 Subject: [PATCH 20/59] Revert "biliass: 2.3.1 -> 2.1.1" This reverts commit 62668ddf42aa45abb6914ae757b81a5180e549a9. --- pkgs/development/python-modules/biliass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 21054b2c5b1e..a3a34d2ca910 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "biliass"; - version = "2.1.1"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; repo = "yutto"; tag = "biliass@${version}"; - hash = "sha256-Pn6z4iDxNcLVoY4xk7v0zc8hmajWEaOYFDEw5HEYxl4="; + hash = "sha256-ZB18BQJRSwA/ERHjqmp+D39UqTvdYpbhwLjaizM5R2I="; }; sourceRoot = "${src.name}/packages/biliass"; @@ -31,7 +31,7 @@ buildPythonPackage rec { sourceRoot cargoRoot ; - hash = "sha256-0/3r4P6SJq4zbZpKW9bn+ljRbYkxWFP8nYxjlMLXioI="; + hash = "sha256-gOYgYi8RlWBe0astv6D6/J7Ge20TM/19zJHwoCevpIo="; }; nativeBuildInputs = with rustPlatform; [ From 9ebe54c8c3946dc31f713df60ecd085ff2ccd3c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 19:41:00 +0000 Subject: [PATCH 21/59] qsv: 10.0.0 -> 11.0.2 --- pkgs/by-name/qs/qsv/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index 9c28248321ff..a1b75c8e6295 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -15,7 +15,7 @@ withUi ? true, buildFeatures ? # enable all features except self_update by default - # https://github.com/dathere/qsv/blob/10.0.0/Cargo.toml#L370 + # https://github.com/dathere/qsv/blob/11.0.2/Cargo.toml#L370 [ "apply" "feature_capable" @@ -33,7 +33,7 @@ let pname = "qsv"; - version = "10.0.0"; + version = "11.0.2"; in rustPlatform.buildRustPackage { inherit pname version buildFeatures; @@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "dathere"; repo = "qsv"; rev = version; - hash = "sha256-Jo2pC+zs3wQAaeQzg6MLySVtI0bB7hLczT62Xpb4L14="; + hash = "sha256-EuNDwzO4tVjJUz8mXI0fDczoPLD89zmbSyfFI8ZrgwU="; }; - cargoHash = "sha256-05jJslguUFLZtugozv/jn7CDie47WnvrFnjC3SUYxxo="; + cargoHash = "sha256-l8hkDr3CtpyXWDTS8oje6W0iu5O28j4rLIXprxTEwHc="; buildInputs = [ file From 38f1ec54d897e864e4845cb501c828a9c1f05be3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 23:02:42 +0000 Subject: [PATCH 22/59] mark: 15.1.0 -> 15.2.0 --- pkgs/by-name/ma/mark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index 787ee1dcce1d..d9709279077d 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -8,16 +8,16 @@ # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 buildGoModule rec { pname = "mark"; - version = "15.1.0"; + version = "15.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "v${version}"; - sha256 = "sha256-7aOzl1+Nihj2UiAAaoQAtTlxr1FSOS/0fYmeg/dYukc="; + sha256 = "sha256-ZvFaSoD9nQtxc5ONWneVgpAfX3f7sS0lBSMXqhABn8o="; }; - vendorHash = "sha256-jbaDk28NIPqjf5fLOJZnsShVw5Ni14JS4J+T0GKNTbQ="; + vendorHash = "sha256-3hfeh7PRzsPfQ+aLPV44ExXum6lG6Huvc7itRIn8mNo="; ldflags = [ "-s" From 255eb9c0fa28402047b6f0b14336173b985480d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 23:13:50 +0000 Subject: [PATCH 23/59] lms: 3.72.1 -> 3.73.0 --- pkgs/by-name/lm/lms/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index efeffa65bf80..59f17dcfd316 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.72.1"; + version = "3.73.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-c6eCfQz/Tc8pg1vVjgidkPj7I85sJ5AcyX7Gf/MTXZI="; + hash = "sha256-9m1YvuYuiiEXAX8HFt61VGZN/ThYXdBcwOSeL05mwOU="; }; strictDeps = true; From b60816ec9ce56f40483e1cb7857e401939a23976 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 23:57:57 +0000 Subject: [PATCH 24/59] gotlsaflare: 2.8.0 -> 2.8.1 --- pkgs/by-name/go/gotlsaflare/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix index 4061de8a3808..e7ee44dd5c43 100644 --- a/pkgs/by-name/go/gotlsaflare/package.nix +++ b/pkgs/by-name/go/gotlsaflare/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotlsaflare"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Stenstromen"; repo = "gotlsaflare"; tag = "v${finalAttrs.version}"; - hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4="; + hash = "sha256-oGuK6jyThBG/Kvsa/g+Z27HuU8n+EX7FDsQVuJPsjS0="; }; - vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM="; + vendorHash = "sha256-NNmNX4ZZsL2m9RfVwy5uJ1uj+YG2jV1hgrrPyZ4dkb8="; nativeBuildInputs = [ installShellFiles ]; From c81ef0997916636641e6092efee758910869ec37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 02:43:07 +0000 Subject: [PATCH 25/59] tremotesf: 2.9.0 -> 2.9.1 --- pkgs/by-name/tr/tremotesf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/tremotesf/package.nix b/pkgs/by-name/tr/tremotesf/package.nix index 8edfd17f6c6b..187eba14263b 100644 --- a/pkgs/by-name/tr/tremotesf/package.nix +++ b/pkgs/by-name/tr/tremotesf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; tag = finalAttrs.version; - hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg="; + hash = "sha256-bDeyVmcKw6pMrsN123OnZio7YHs1Y/bfg+EnFTHY8gE="; # We need this for src/libtremotesf fetchSubmodules = true; }; From 8ef4a5d98fb2b70735f06191b8db60ac4d8c8861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 02:44:00 +0000 Subject: [PATCH 26/59] crush: 0.20.1 -> 0.22.1 --- pkgs/by-name/cr/crush/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index eedbb2b25844..44c55d6defff 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.20.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-SfuMX6ZiOFwi9dx1ZAM3uIKCjl52X93JzQa71q6uXAY="; + hash = "sha256-WwakKR+JdlidfxXnKmAPVMxRs/TfNPOg43vQ9HrEqFY="; }; - vendorHash = "sha256-mlX961xljS+KcP+ReQsP6N1VK6blG0yLpRVIvXJAQBw="; + vendorHash = "sha256-9WROtIp4Tt+9w+L+frLawwoyMCjuk41VIGYEi5oSHDk="; ldflags = [ "-s" From d6b46ba797cf5f6431a0f480a14cddb852c687f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 03:00:20 +0000 Subject: [PATCH 27/59] cargo-about: 0.8.3 -> 0.8.4 --- pkgs/by-name/ca/cargo-about/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 1e3bd2cb53fa..6dfb746009f1 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; tag = version; - sha256 = "sha256-MRrcSVWcvp0E135ViKbPo7a60TcYjWZNj8ZL/lJ/XDM="; + sha256 = "sha256-QbmZIbn/xPZUTXNpUjGuWTjoh8RpsMRuVIfJRO9M3xM="; }; - cargoHash = "sha256-KIc3LPkFGMvNusyRAhaejv6wZjQnDmrGn4cOTYb70KM="; + cargoHash = "sha256-oO5Kp5A2v1w6EUwgcHhyagZDIK7a/2d9uTiCoXHuHhY="; nativeBuildInputs = [ pkg-config ]; From a089905408d06b503219139ff7b1a142de3f518d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 03:23:38 +0000 Subject: [PATCH 28/59] clive: 0.12.15 -> 0.12.16 --- pkgs/by-name/cl/clive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index 239b60b916a0..f292ec880072 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -11,16 +11,16 @@ }: buildGoModule rec { pname = "clive"; - version = "0.12.15"; + version = "0.12.16"; src = fetchFromGitHub { owner = "koki-develop"; repo = "clive"; tag = "v${version}"; - hash = "sha256-WOcqcyhyv72tNmm7mETjboStesfFfVVAmN2ZdLFd1Uc="; + hash = "sha256-bZzK7RLAStRb9R3V/TK6tZV6yv1C7MGslAhhpWDzdWk="; }; - vendorHash = "sha256-QfHCrou7Lr1CrRQqvLEnWTtQk8aDigkm4SBArLjMkyo="; + vendorHash = "sha256-BDspmaATLIfwyqxwJNJ24vpEETUWGVbobHWD2NRaOi4="; subPackages = [ "." ]; buildInputs = [ ttyd ]; nativeBuildInputs = [ From cddd1f1ffc6a0115720907c99d178bdf879e4301 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:27:29 +0000 Subject: [PATCH 29/59] qtpass: migrate to pkgs/by-name --- .../qt/qtpass/package.nix} | 20 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) rename pkgs/{applications/misc/qtpass/default.nix => by-name/qt/qtpass/package.nix} (89%) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/by-name/qt/qtpass/package.nix similarity index 89% rename from pkgs/applications/misc/qtpass/default.nix rename to pkgs/by-name/qt/qtpass/package.nix index 60cfc60bd138..bfe9f0238874 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/by-name/qt/qtpass/package.nix @@ -1,17 +1,13 @@ { + stdenv, fetchFromGitHub, lib, - stdenv, + libsForQt5, git, gnupg, pass, pwgen, qrencode, - qtbase, - qtsvg, - qttools, - qmake, - wrapQtAppsHook, makeWrapper, }: @@ -35,20 +31,20 @@ stdenv.mkDerivation rec { git gnupg pass - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook makeWrapper ]; qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: - "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + "QMAKE_LUPDATE=${libsForQt5.qttools.dev}/bin/lupdate" ]; qtWrapperArgs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84448f2750a6..4226903662bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11866,8 +11866,6 @@ with pkgs; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override { From 46cf4949561d78286a10f609fb9e6cd8fc315492 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:27:44 +0000 Subject: [PATCH 30/59] qtpass: modernise --- pkgs/by-name/qt/qtpass/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/qt/qtpass/package.nix b/pkgs/by-name/qt/qtpass/package.nix index bfe9f0238874..3e6fec64322c 100644 --- a/pkgs/by-name/qt/qtpass/package.nix +++ b/pkgs/by-name/qt/qtpass/package.nix @@ -11,15 +11,15 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtpass"; version = "1.4.0"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; - rev = "v${version}"; - sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; }; postPatch = '' @@ -72,12 +72,12 @@ stdenv.mkDerivation rec { install -D qtpass.1 -t $out/share/man/man1 ''; - meta = with lib; { + meta = { description = "Multi-platform GUI for pass, the standard unix password manager"; mainProgram = "qtpass"; homepage = "https://qtpass.org"; - license = licenses.gpl3; - maintainers = [ maintainers.hrdinka ]; - platforms = platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.hrdinka ]; + platforms = lib.platforms.all; }; -} +}) From 7faebac97e2fffecd8b8de1fbdae6f9cb9a335e7 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:27:48 +0000 Subject: [PATCH 31/59] digitalbitbox: migrate to pkgs/by-name --- .../di/digitalbitbox/package.nix} | 31 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 19 deletions(-) rename pkgs/{applications/misc/digitalbitbox/default.nix => by-name/di/digitalbitbox/package.nix} (89%) diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/by-name/di/digitalbitbox/package.nix similarity index 89% rename from pkgs/applications/misc/digitalbitbox/default.nix rename to pkgs/by-name/di/digitalbitbox/package.nix index fd805af2cdea..f9115ec59ba9 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/by-name/di/digitalbitbox/package.nix @@ -1,5 +1,5 @@ { - mkDerivation, + stdenv, lib, autoreconfHook, curl, @@ -7,15 +7,12 @@ git, libevent, libtool, + libsForQt5, qrencode, udev, libusb1, makeWrapper, pkg-config, - qtbase, - qttools, - qtwebsockets, - qtmultimedia, udevRule51 ? '' SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402" '', @@ -49,7 +46,7 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "digitalbitbox"; version = "3.0.0"; @@ -71,8 +68,9 @@ mkDerivation rec { git makeWrapper pkg-config - qttools + libsForQt5.qttools udevCheckHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -81,18 +79,17 @@ mkDerivation rec { udev libusb1 qrencode - - qtbase - qtwebsockets - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtwebsockets + libsForQt5.qtmultimedia ]; - LUPDATE = "${qttools.dev}/bin/lupdate"; - LRELEASE = "${qttools.dev}/bin/lrelease"; - MOC = "${qtbase.dev}/bin/moc"; - QTDIR = qtbase.dev; - RCC = "${qtbase.dev}/bin/rcc"; - UIC = "${qtbase.dev}/bin/uic"; + LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate"; + LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease"; + MOC = "${libsForQt5.qtbase.dev}/bin/moc"; + QTDIR = libsForQt5.qtbase.dev; + RCC = "${libsForQt5.qtbase.dev}/bin/rcc"; + UIC = "${libsForQt5.qtbase.dev}/bin/uic"; configureFlags = [ "--enable-libusb" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4226903662bf..90710a5cb6ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -403,8 +403,6 @@ with pkgs; name = "die-hook"; } ../build-support/setup-hooks/die.sh; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - devShellTools = callPackage ../build-support/dev-shell-tools { }; dockerTools = callPackage ../build-support/docker { From 5d55c6115e2b0ec82c0a2eacdd55a2c4ad7c4963 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:27:52 +0000 Subject: [PATCH 32/59] digitalbitbox: modernise --- pkgs/by-name/di/digitalbitbox/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/di/digitalbitbox/package.nix b/pkgs/by-name/di/digitalbitbox/package.nix index f9115ec59ba9..c07c6f8df244 100644 --- a/pkgs/by-name/di/digitalbitbox/package.nix +++ b/pkgs/by-name/di/digitalbitbox/package.nix @@ -46,15 +46,15 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "digitalbitbox"; version = "3.0.0"; src = fetchFromGitHub { owner = "digitalbitbox"; repo = "dbb-app"; - rev = "v${version}"; - sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; # configure.ac:23: error: AC_CONFIG_MACRO_DIR can only be used once @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; - meta = with lib; { + meta = { description = "QT based application for the Digital Bitbox hardware wallet"; longDescription = '' Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { to the configuration which installs the package and enables the hardware module. ''; homepage = "https://digitalbitbox.com/"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; -} +}) From 92b8b7f10c12fcf0aadcb1743dea80e3c0cef261 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:01 +0000 Subject: [PATCH 33/59] pe-bear: move to pkgs/by-name --- .../pe-bear/default.nix => by-name/pe/pe-bear/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/pe-bear/default.nix => by-name/pe/pe-bear/package.nix} (92%) diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/by-name/pe/pe-bear/package.nix similarity index 92% rename from pkgs/applications/misc/pe-bear/default.nix rename to pkgs/by-name/pe/pe-bear/package.nix index 16fc1b48f442..7a4c51b8a3da 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/by-name/pe/pe-bear/package.nix @@ -3,8 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -21,11 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90710a5cb6ad..6397d4daa346 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -504,8 +504,6 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; - magika = with python3Packages; toPythonApplication magika; mysql-shell = mysql-shell_8; From 6c0f440e305684c5de9ba6a431f3d8dda1c14324 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:10 +0000 Subject: [PATCH 34/59] pe-bear: modernise --- pkgs/by-name/pe/pe-bear/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pe/pe-bear/package.nix b/pkgs/by-name/pe/pe-bear/package.nix index 7a4c51b8a3da..aa4793209a9c 100644 --- a/pkgs/by-name/pe/pe-bear/package.nix +++ b/pkgs/by-name/pe/pe-bear/package.nix @@ -6,14 +6,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pe-bear"; version = "0.7.1"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jWRO0vO601IijFo7nu0SMF8inEXWLzv+Ni1nlJfGqhQ="; fetchSubmodules = true; }; @@ -27,23 +27,23 @@ stdenv.mkDerivation rec { libsForQt5.qtbase ]; - meta = with lib; { + meta = { description = "Portable Executable reversing tool with a friendly GUI"; mainProgram = "PE-bear"; homepage = "https://hshrzd.wordpress.com/pe-bear/"; - license = [ + license = with lib.licenses; [ # PE-Bear - licenses.gpl2Only + gpl2Only # Vendored capstone - licenses.bsd3 + bsd3 # Vendored bearparser - licenses.bsd2 + bsd2 ]; - maintainers = with maintainers; [ blitz ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.blitz ]; + platforms = lib.platforms.linux; }; -} +}) From 4550c31e8743aa9256a14ef4de8e73454a5e5bb6 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:15 +0000 Subject: [PATCH 35/59] ocs-url: migrate to pkgs/by-name --- .../misc/ocs-url/default.nix => by-name/oc/ocs-url/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/ocs-url/default.nix => by-name/oc/ocs-url/package.nix} (100%) diff --git a/pkgs/tools/misc/ocs-url/default.nix b/pkgs/by-name/oc/ocs-url/package.nix similarity index 100% rename from pkgs/tools/misc/ocs-url/default.nix rename to pkgs/by-name/oc/ocs-url/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6397d4daa346..dcab8d81a6db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1074,8 +1074,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; - openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; openusd = python3Packages.openusd.override { From d1fefd49dabe29ad9bb30221d74150515ab426b1 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:19 +0000 Subject: [PATCH 36/59] veikk-linux-driver-gui: migrate to pkgs/by-name --- .../ve/veikk-linux-driver-gui/package.nix} | 11 +++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/veikk-linux-driver-gui/default.nix => by-name/ve/veikk-linux-driver-gui/package.nix} (84%) diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix similarity index 84% rename from pkgs/tools/misc/veikk-linux-driver-gui/default.nix rename to pkgs/by-name/ve/veikk-linux-driver-gui/package.nix index 8069e7cec5d1..8e3673cabf71 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix @@ -1,11 +1,11 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, - qmake, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "veikk-linux-driver-gui"; version = "2.0"; @@ -16,7 +16,10 @@ mkDerivation rec { sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; postBuild = '' make all clean diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcab8d81a6db..6f83727d2cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1097,8 +1097,6 @@ with pkgs; ufolint = with python3Packages; toPythonApplication ufolint; - veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; - ventoy-full = ventoy.override { withCryptsetup = true; withXfs = true; From e37d8ba012b9e1952248af38010ac05a7075543d Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:24 +0000 Subject: [PATCH 37/59] veikk-linux-driver-gui: modernise --- .../ve/veikk-linux-driver-gui/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix index 8e3673cabf71..2d93bbf90683 100644 --- a/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix +++ b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix @@ -5,15 +5,15 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "veikk-linux-driver-gui"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = pname; - rev = "v${version}"; - sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; + repo = "veikk-linux-driver-gui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ssQ54d+4H0a0FF3BrVlHPrPd7WlBocFLep9KPtPB4Qk="; }; nativeBuildInputs = [ @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { cp veikk-linux-driver-gui $out/bin ''; - meta = with lib; { + meta = { description = "Configuration tool for the VEIKK Linux driver"; homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ nicbk ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nicbk ]; mainProgram = "veikk-linux-driver-gui"; }; -} +}) From 9ea93118de0a583c70343c4be86fab55cec79b6f Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:28 +0000 Subject: [PATCH 38/59] cool-retro-term: migrate to pkgs/by-name --- .../co/cool-retro-term/package.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 14 deletions(-) rename pkgs/{applications/terminal-emulators/cool-retro-term/default.nix => by-name/co/cool-retro-term/package.nix} (84%) diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/by-name/co/cool-retro-term/package.nix similarity index 84% rename from pkgs/applications/terminal-emulators/cool-retro-term/default.nix rename to pkgs/by-name/co/cool-retro-term/package.nix index 2e91884aa2d2..233b7674108a 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/by-name/co/cool-retro-term/package.nix @@ -2,16 +2,11 @@ lib, stdenv, fetchFromGitHub, - mkDerivation, - qtbase, - qmltermwidget, - qtquickcontrols2, - qtgraphicaleffects, - qmake, + libsForQt5, nixosTests, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "1.2.0"; pname = "cool-retro-term"; @@ -27,13 +22,16 @@ mkDerivation rec { ''; buildInputs = [ - qtbase - qmltermwidget - qtquickcontrols2 - qtgraphicaleffects + libsForQt5.qtbase + libsForQt5.qmltermwidget + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f83727d2cb2..6f1d1d9381d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1414,8 +1414,6 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS - cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - kitty = callPackage ../by-name/ki/kitty/package.nix { inherit (darwin) autoSignDarwinBinariesHook; }; From d2f3dc913dce46afccbe7fb5f815e27bdddedac0 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:32 +0000 Subject: [PATCH 39/59] asymptote: migrate to pkgs/by-name --- .../default.nix => by-name/as/asymptote/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{tools/graphics/asymptote/default.nix => by-name/as/asymptote/package.nix} (98%) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/by-name/as/asymptote/package.nix similarity index 98% rename from pkgs/tools/graphics/asymptote/default.nix rename to pkgs/by-name/as/asymptote/package.nix index c40eef77c647..e0608eb5d8f6 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -6,7 +6,6 @@ bison, glm, flex, - wrapQtAppsHook, cmake, pkg-config, libglut, @@ -14,6 +13,7 @@ imagemagick, fftw, eigen, + libsForQt5, libtirpc, boehmgc, libGLU, @@ -24,8 +24,6 @@ gsl, libsigsegv, python3, - qtbase, - qtsvg, boost186, zlib, perl, @@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { flex bison texinfo - wrapQtAppsHook + libsForQt5.wrapQtAppsHook cmake ghostscriptX perl @@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { zlib perl curl - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg # relies on removed asio::io_service # https://github.com/kuafuwang/LspCpp/issues/52 boost186 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f1d1d9381d4..25ef040566e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1490,8 +1490,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; - authelia = callPackage ../servers/authelia { buildGoModule = buildGo124Module; pnpm = pnpm_10; From c0956ce317c95503ed68bc0b798c4281bc296a66 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:36 +0000 Subject: [PATCH 40/59] asymptote: modernise --- pkgs/by-name/as/asymptote/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/as/asymptote/package.nix b/pkgs/by-name/as/asymptote/package.nix index e0608eb5d8f6..c5ab1571c8a5 100644 --- a/pkgs/by-name/as/asymptote/package.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -197,11 +197,11 @@ stdenv.mkDerivation (finalAttrs: { # make: *** [Makefile:272: install-asy] Error 1 enableParallelInstalling = false; - meta = with lib; { + meta = { description = "Tool for programming graphics intended to replace Metapost"; homepage = "https://asymptote.sourceforge.io/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) From 3ed41beefa53a9b66791a98259609fdabc812bc6 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:41 +0000 Subject: [PATCH 41/59] guglielmo: migrate to pkgs/by-name --- .../default.nix => by-name/gu/guglielmo/package.nix} | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{applications/radio/guglielmo/default.nix => by-name/gu/guglielmo/package.nix} (89%) diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/by-name/gu/guglielmo/package.nix similarity index 89% rename from pkgs/applications/radio/guglielmo/default.nix rename to pkgs/by-name/gu/guglielmo/package.nix index e1a81e9b40f1..513c244f6ca8 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/by-name/gu/guglielmo/package.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -9,14 +9,13 @@ fdk_aac, faad2, fftwFloat, + libsForQt5, libsndfile, libsamplerate, portaudio, - qtmultimedia, - qwt, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "guglielmo"; version = "0.5"; @@ -34,6 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ airspy @@ -44,8 +44,8 @@ mkDerivation rec { libsndfile libsamplerate portaudio - qtmultimedia - qwt + libsForQt5.qtmultimedia + libsForQt5.qwt ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25ef040566e7..1c016abf7744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1622,8 +1622,6 @@ with pkgs; go2tv-lite = go2tv.override { withGui = false; }; - guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; - hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hwi = with python3Packages; toPythonApplication hwi; From 38d70a9e126ce5b3d3e589427e942ba9d3ec672e Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:45 +0000 Subject: [PATCH 42/59] guglielmo: modernise --- pkgs/by-name/gu/guglielmo/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gu/guglielmo/package.nix b/pkgs/by-name/gu/guglielmo/package.nix index 513c244f6ca8..b16b3393064a 100644 --- a/pkgs/by-name/gu/guglielmo/package.nix +++ b/pkgs/by-name/gu/guglielmo/package.nix @@ -15,15 +15,15 @@ portaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guglielmo"; version = "0.5"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = "guglielmo"; - rev = "v${version}"; - sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; }; postInstall = '' @@ -53,12 +53,12 @@ stdenv.mkDerivation rec { patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped ''; - meta = with lib; { + meta = { description = "Qt based FM / Dab tuner"; mainProgram = "guglielmo"; homepage = "https://github.com/marcogrecopriolo/guglielmo"; - license = licenses.gpl2Only; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.markuskowa ]; + platforms = lib.platforms.linux; }; -} +}) From 35804aeee3ca398919fe33e5bc981750b23b5242 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:49 +0000 Subject: [PATCH 43/59] cmst: migrate to pkgs/by-name --- .../default.nix => by-name/cm/cmst/package.nix} | 15 +++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/{tools/networking/cmst/default.nix => by-name/cm/cmst/package.nix} (83%) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/by-name/cm/cmst/package.nix similarity index 83% rename from pkgs/tools/networking/cmst/default.nix rename to pkgs/by-name/cm/cmst/package.nix index 54189d208331..a6cfdf31b42a 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/by-name/cm/cmst/package.nix @@ -1,14 +1,12 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, - qmake, - qtbase, - qttools, + libsForQt5, gitUpdater, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cmst"; version = "2023.03.14"; @@ -20,11 +18,12 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c016abf7744..3e784aac07e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2302,8 +2302,6 @@ with pkgs; ; citrix_workspace = citrix_workspace_25_05_0; - cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - colord-gtk4 = colord-gtk.override { withGtk4 = true; }; connmanFull = connman.override { From 502a93fdce0aff242a0f38a31268c78395c8bfbc Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:54 +0000 Subject: [PATCH 44/59] cmst: modernise --- pkgs/by-name/cm/cmst/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cm/cmst/package.nix b/pkgs/by-name/cm/cmst/package.nix index a6cfdf31b42a..dbf87ce4163d 100644 --- a/pkgs/by-name/cm/cmst/package.nix +++ b/pkgs/by-name/cm/cmst/package.nix @@ -6,15 +6,15 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmst"; version = "2023.03.14"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; - rev = "${pname}-${version}"; - sha256 = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk="; + tag = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk="; }; nativeBuildInputs = [ @@ -32,18 +32,18 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - rev-prefix = "${pname}-"; + rev-prefix = "${finalAttrs.pname}-"; }; - meta = with lib; { + meta = { description = "QT GUI for Connman with system tray icon"; mainProgram = "cmst"; homepage = "https://github.com/andrew-bibb/cmst"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ matejc romildo ]; - platforms = platforms.linux; - license = licenses.mit; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; -} +}) From 3390388102c6697126d80615f48b626b62b60aa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 03:47:31 +0000 Subject: [PATCH 45/59] ente-web: 1.2.20 -> 1.2.22 --- pkgs/by-name/en/ente-web/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 5b233d557d09..4f391c42b084 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web-${enteApp}"; - version = "1.2.20"; + version = "1.2.22"; src = fetchFromGitHub { owner = "ente-io"; From cd163383d4d5676c065b7d9e29327c87f49f3375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 04:26:25 +0000 Subject: [PATCH 46/59] balena-cli: 23.2.2 -> 23.2.8 --- pkgs/by-name/ba/balena-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index fdfd40d1c701..0c2104ae9cb7 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -21,16 +21,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "23.2.2"; + version = "23.2.8"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-HAcsFGLUUaeNxEBAFgYjDipu8QTsd+8yptC6kAX0C4g="; + hash = "sha256-qczkG1+6sn/n+Ew/HD5Ki8epZW3UEpREc3fjS2VS1go="; }; - npmDepsHash = "sha256-dT5WrrzrO5tcP4/NFe5WTG7boYTOlFRNut52X2AWaao="; + npmDepsHash = "sha256-b5LNCOai6DyJx5VDaNHWFq9rvj5g9kwXqnUoS7fb8z4="; makeCacheWritable = true; From 5da2d096c051ff016486fce5205db0bd1e417674 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Tue, 9 Dec 2025 08:04:12 +0100 Subject: [PATCH 47/59] claude-code: 2.0.61 -> 2.0.62 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 857d56f650e8..52b7d69e4a56 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.61", + "version": "2.0.62", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.61", + "version": "2.0.62", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 95ced91e418f..d1462c2979d0 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -11,14 +11,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.61"; + version = "2.0.62"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-701TwdPtqudwKuphVngMiI6TbM9y1S/HFVTREhkHgdY="; + hash = "sha256-fsYTcbn1wvysECAZfiBCAM9tnNx5bIC7QTKaGw5rfjQ="; }; - npmDepsHash = "sha256-lPWrFSintH3/4T5IKSH9tBX3q3Ow/L0ptk+NsVGR+uQ="; + npmDepsHash = "sha256-q1jBjwVxc0mP+rbW3VHYp85Q14cjilzIWq3kNpjsxLY="; postPatch = '' cp ${./package-lock.json} package-lock.json From 68defc8805a20c789ae831a296b294281c9f17a9 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Tue, 9 Dec 2025 08:04:19 +0100 Subject: [PATCH 48/59] vscode-extensions.anthropic.claude-code: 2.0.61 -> 2.0.62 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 511cb04a355a..01cb7ff866bf 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.61"; - hash = "sha256-dZu2CIjRyvAhTRwOuQV2s0SoEUQko+dQfnQg6ECwLv4="; + version = "2.0.62"; + hash = "sha256-2w4ZMOM7EI0rEKoUocwnHVlNVk6smCiX0nTgTpdZo2s="; }; meta = { From 7c5aec3576a093c19afe8e0a8a14a49691fdaf8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 07:10:33 +0000 Subject: [PATCH 49/59] gauge-unwrapped: 1.6.21 -> 1.6.22 --- pkgs/by-name/ga/gauge-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix index a82dea06615f..f9eae3df486d 100644 --- a/pkgs/by-name/ga/gauge-unwrapped/package.nix +++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.21"; + version = "1.6.22"; patches = [ # adds a check which adds an error message when trying to @@ -18,10 +18,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; tag = "v${version}"; - hash = "sha256-mUuoGLAVUShhNsSjURCL6yWcIW+K7P8KEBwBoBelgyw="; + hash = "sha256-6RJj+sDffqzdMlMkE/rJ7AEKYcxDQBR86fjlaNDb6M0="; }; - vendorHash = "sha256-WyQbvZNd61L4Bz5btZ2hkrCTb5iuJJU5yNDzuYR5Sdc="; + vendorHash = "sha256-nxd+3hKHLUiHpSGTJpD5QRFJ4e0Boq5MTijmND56Uug="; excludedPackages = [ "build" From 0d00429d0cd29c7adb45dd5b6366a1b33ef5a579 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 07:26:53 +0000 Subject: [PATCH 50/59] LycheeSlicer: 7.5.1 -> 7.5.2 --- pkgs/by-name/ly/LycheeSlicer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index d5ce649830d2..0c1da12790ac 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-mjpBE896mKQbJZysGW6skzisrUhcanU0tMB8bk4YauM="; + hash = "sha256-f6Ug0m1BKvSFGIG3lC/YBcR1JXQGEJ/rAimdq36iTco="; }; desktopItem = makeDesktopItem { From d66663fa66e77b5b34a3ed97ffd8191eb4ae297e Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:29:55 +0800 Subject: [PATCH 51/59] biliass: disable auto update --- pkgs/development/python-modules/biliass/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index a3a34d2ca910..b1db00398b2b 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -8,6 +8,8 @@ libiconv, }: +# r-ryantm wants to downgrade +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "biliass"; version = "2.3.1"; From 0277dfb3b787fdf4937c025f6f39482603b7d664 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 07:46:19 +0000 Subject: [PATCH 52/59] werf: 2.55.0 -> 2.55.4 --- pkgs/by-name/we/werf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 7c95fbaaae4b..365ef0679e13 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.55.0"; + version = "2.55.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-mzZmLdzMlAArn8qr2fZH+U4Buewr+eBwyLCmqXKzlAM="; + hash = "sha256-bfz9mjvvqT6jA9CGLNGox8IaE0QzVGWRc5I/vaB6e5M="; }; proxyVendor = true; From f9ef16109072f454d7a76574260f102615c38eae Mon Sep 17 00:00:00 2001 From: Jhony Elmer Angulo Fabian Date: Tue, 9 Dec 2025 03:04:44 -0500 Subject: [PATCH 53/59] codex: 0.65.0 -> 0.66.0 --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index a49f28ad465f..5f5b0d2f649f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-1zh6ifwavP3RFqQbHIClEQ4cKRQ5LdU61LReA6+HSW8="; + hash = "sha256-IO5bZOkMcpIB0751d9PV32C21CIFuZPa/p8tVmoNwuA="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-XzqEI8wpI5g1+u+AOWiZYOzCVhwysMtHKPDpcfu2HAU="; + cargoHash = "sha256-ilzYG2W7xdpdCnrKN1LIrMvAjCAVJx6106sbApkH/60="; nativeBuildInputs = [ installShellFiles From 71239986195b9a7bccba88f0866909b3c70c5352 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 08:15:25 +0000 Subject: [PATCH 54/59] python3Packages.weaviate-client: 4.18.2 -> 4.18.3 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 4c4cccda3024..e23459a93bf3 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.18.2"; + version = "4.18.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-WaNTYV8HmfyC+OuDZOMmb5uKaACxmdk5qXZ9AxsMQaw="; + hash = "sha256-2cgj7Ry6lcmrvjhXkAmUO1vjsjF2dZxb1MsbQH3uElM="; }; pythonRelaxDeps = [ From e1f99dd0cca0961be9d277ebe7388708a0a1b72c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Dec 2025 13:42:23 +0100 Subject: [PATCH 55/59] python313Packages.iamdata: 0.1.202512071 -> 0.1.202512081 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202512071...v0.1.202512081 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202512081 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index f4db27626d04..62ce418cfd06 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512071"; + version = "0.1.202512081"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-gP8Dar9tFolccIsC5xs0wI8T3licZzikdqvhtw/eQ+U="; + hash = "sha256-1zMFtV1s+JiBUWeSIcDSetliCp8XUCD3IkqvQIeHvUU="; }; __darwinAllowLocalNetworking = true; From 9138a3454180cb4a114aeb69cdfdbcdc823ee29f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Dec 2025 09:25:16 +0100 Subject: [PATCH 56/59] python313Packages.iamdata: 0.1.202512081 -> 0.1.202512091 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202512081...v0.1.202512091 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202512091 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 62ce418cfd06..f991b776c43c 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512081"; + version = "0.1.202512091"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-1zMFtV1s+JiBUWeSIcDSetliCp8XUCD3IkqvQIeHvUU="; + hash = "sha256-y6DlcmPRC/yG++ejpbzVCOgPmj53pKwEWilxdep6x7Q="; }; __darwinAllowLocalNetworking = true; From fe0113d0ff668f1b5f36bc9ec0fbdd217a495b03 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 9 Dec 2025 09:31:08 +0100 Subject: [PATCH 57/59] release.nix: fix missing rename --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6e70d80c7cac..0dbfa8b80938 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -221,7 +221,7 @@ let jobs.metrics jobs.manual jobs.lib-tests - jobs.pkgs-lib-tests + jobs.tests.pkgs-lib.formats-tests.x86_64-linux jobs.stdenv.x86_64-linux jobs.cargo.x86_64-linux jobs.go.x86_64-linux From 6280c05a83ca2c968eebd7f5a4d5ef0ba59d59ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 08:50:43 +0000 Subject: [PATCH 58/59] syncthingtray: 2.0.3 -> 2.0.5 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b85b0f0bd903..d54b3b1e74cc 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.0.3"; + version = "2.0.5"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-vvbzXwujOIk3g/SvNM3JGkt956RN9VR0Pcx5nzg1IU0="; + hash = "sha256-a2pYQCpcF4nIr2HaU+29umiTdXN2P//+a9SZ7pG55lo="; }; buildInputs = [ From 85d62f37317c2f36b0f0fc51e9360b3a40a503d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Dec 2025 08:57:10 +0000 Subject: [PATCH 59/59] supabase-cli: 2.62.10 -> 2.65.5 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 7259dc775444..9013400b9900 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.62.10"; + version = "2.65.5"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-rHu74DHbmy+/1mdsEvvND4bzVzVXfQoSXfJIzPYSq2s="; + hash = "sha256-uxRC5T9i4JbMqRT8pCnbqhuNl1GxrhgqsDLrMNy8fgM="; }; - vendorHash = "sha256-neUCgxE7NH6rRKrmjpkzwcCFxYxiqgu5/0b0e/833Ng="; + vendorHash = "sha256-rBlLfKcaWAYaC+3M9YgjHcne70ohNeOZ6JGt3Uwra4k="; ldflags = [ "-s"