diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 77d09a0ef8c0..88a2b267484a 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -22,17 +22,6 @@
- doc/**/*
- nixos/doc/**/*
-"backport release-25.11":
- - all:
- - changed-files:
- - any-glob-to-any-file:
- - .github/actions/**/*
- - .github/workflows/*
- - .github/labeler*.yml
- - ci/**/*.*
- - maintainers/github-teams.json
- - base-branch: ['master']
-
"backport release-26.05":
- all:
- changed-files:
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 3aac3ccf8b73..d14c482df755 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -31,12 +31,6 @@ jobs:
max-parallel: 1
matrix:
pairs:
- - from: release-25.11
- into: staging-next-25.11
- - from: staging-next-25.11
- into: staging-25.11
- - from: release-25.11
- into: staging-nixos-25.11
- from: release-26.05
into: staging-next-26.05
- from: staging-next-26.05
diff --git a/ci/default.nix b/ci/default.nix
index 6ade8164d503..eb7b45e4bbb5 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -38,6 +38,17 @@ let
check = treefmt.check nixFilesSrc;
};
+ # nixos-render-docs and nixos-render-docs-redirects
+ # Should be used from tree to build the matching in-tree documentation
+ docPkgs = pkgs.extend (
+ final: prev: {
+ nixos-render-docs = final.callPackage ../pkgs/by-name/ni/nixos-render-docs/package.nix { };
+ nixos-render-docs-redirects =
+ final.callPackage ../pkgs/by-name/ni/nixos-render-docs-redirects/package.nix
+ { };
+ }
+ );
+
in
rec {
inherit pkgs fmt;
@@ -53,7 +64,7 @@ rec {
# CI jobs
lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
- manual-nixpkgs = (import ../doc { inherit pkgs; });
+ manual-nixpkgs = (import ../doc { pkgs = docPkgs; });
nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix {
nix = pkgs.nixVersions.latest;
};
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 9f0f5daf1332..9288a9e1b1db 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -474,7 +474,7 @@ in
*/
oldestSupportedRelease =
# Update on master only. Do not backport.
- 2511;
+ 2605;
/**
Whether a feature is supported in all supported releases (at the time of
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe3e6ed29f07..6cb590d3a614 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -814,6 +814,12 @@
github = "aftix";
githubId = 4008299;
};
+ agarmu = {
+ name = "Mukul Agarwal";
+ email = "vcs@agarmu.com";
+ github = "agarmu";
+ githubId = 55563106;
+ };
agbrooks = {
email = "andrewgrantbrooks@gmail.com";
github = "agbrooks";
@@ -876,6 +882,12 @@
matrix = "aiya:catgirl.cloud";
name = "aiya";
};
+ aietes = {
+ email = "stefan@standa.de";
+ github = "Aietes";
+ githubId = 5823770;
+ name = "Stefan Krüger";
+ };
aij = {
email = "aij+git@mrph.org";
github = "aij";
@@ -5753,6 +5765,12 @@
githubId = 4162215;
keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; } ];
};
+ croots = {
+ name = "Cameron Roots";
+ github = "croots";
+ githubId = 38054423;
+ keys = [ { fingerprint = "8496 ECF3 0961 115C A6DE 919F A01D C430 0605 1618"; } ];
+ };
crop = {
email = "crop_tech@proton.me";
name = "crop";
@@ -8297,6 +8315,12 @@
githubId = 7820865;
name = "Eric Dallo";
};
+ erics118 = {
+ name = "Eric Shen";
+ github = "erics118";
+ githubId = 52634785;
+ email = "ericshen118@gmail.com";
+ };
ericson2314 = {
email = "John.Ericson@Obsidian.Systems";
matrix = "@Ericson2314:matrix.org";
@@ -9327,7 +9351,7 @@
fraioveio = {
email = "francesco@vecchia.lol";
github = "FraioVeio";
- githubId = 181361445;
+ githubId = 44584365;
name = "Francesco Vecchia";
};
franciscod = {
@@ -9364,6 +9388,12 @@
github = "frectonz";
githubId = 53809656;
};
+ fred441a = {
+ email = "frederik@altofte.dk";
+ github = "fred441a";
+ githubId = 10808098;
+ name = "Frederik Hansen";
+ };
fredeb = {
email = "frederikbraendstrup@gmail.com";
github = "FredeHoey";
@@ -13634,6 +13664,11 @@
githubId = 4611077;
name = "Raymond Gauthier";
};
+ jromer = {
+ github = "jelleromer";
+ githubId = 11951893;
+ name = "Jelle Römer";
+ };
jrpotter = {
email = "jrpotter2112@gmail.com";
github = "jrpotter";
@@ -13926,6 +13961,13 @@
githubId = 2396926;
name = "Justin Woo";
};
+ justkrysteq = {
+ email = "justkrysteq@proton.me";
+ github = "justkrysteq";
+ githubId = 43525126;
+ name = "Krysteq";
+ matrix = "@krysteq:matrix.org";
+ };
jvanbruegge = {
email = "supermanitu@gmail.com";
github = "jvanbruegge";
@@ -15771,6 +15813,17 @@
githubId = 124475;
name = "Olli Helenius";
};
+ ligerothetiger = {
+ email = "ligero@ligerothetiger.com";
+ name = "LigeroTheTiger";
+ github = "LigeroTheTiger";
+ githubId = 42996211;
+ keys = [
+ {
+ fingerprint = "5zLV9yqjL18GsG1qan0tGM5341niQNYnU/hiBCscn04";
+ }
+ ];
+ };
lightbulbjim = {
email = "chris@killred.net";
github = "lightbulbjim";
@@ -19228,6 +19281,12 @@
githubId = 61601147;
name = "basti n00b0ss";
};
+ n0pl4c3 = {
+ email = "mail@n0pl4c3.net";
+ github = "n0pl4c3";
+ githubId = 69087176;
+ name = "n0pl4c3";
+ };
n3oney = {
name = "Michał Minarowski";
email = "nixpkgs@neoney.dev";
@@ -24995,6 +25054,12 @@
githubId = 149248;
name = "Christian Rackerseder";
};
+ screwys = {
+ email = "screwygit@proton.me";
+ github = "screwys";
+ githubId = 254296947;
+ name = "screwy";
+ };
Scriptkiddi = {
email = "nixos@scriptkiddi.de";
matrix = "@fritz.otlinghaus:helsinki-systems.de";
@@ -30084,6 +30149,11 @@
githubId = 168610;
name = "Ricardo M. Correia";
};
+ wjohnsto = {
+ name = "Will Johnston";
+ github = "wjohnsto";
+ githubId = 785258;
+ };
wkral = {
email = "william.kral@gmail.com";
github = "wkral";
@@ -30589,6 +30659,12 @@
github = "yarektyshchenko";
githubId = 185304;
};
+ yarn = {
+ name = "yarncat";
+ github = "yaaaarn";
+ githubId = 30006414;
+ email = "nix@yarncat.moe";
+ };
yarny = {
github = "Yarny0";
githubId = 41838844;
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 0515d93d71cb..82f923f13b0f 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -24,6 +24,7 @@ let
getExe
types
maintainers
+ makeBinPath
;
cfg = config.services.wivrn;
configFormat = pkgs.formats.json { };
@@ -63,13 +64,24 @@ let
enabledConfig = optionalString cfg.config.enable "-f ${configFile}";
# Manage server executables and flags
- serverExec = concatStringsSep " " (
+ serverCmdline = concatStringsSep " " (
[
serverPackageExe
enabledConfig
]
++ cfg.extraServerFlags
);
+ serverExec =
+ if cfg.steam.enable then
+ lib.getExe (
+ pkgs.writeShellScriptBin "start-wivrn-server" ''
+ # The server needs Steam in PATH to open Steam games from the application launcher
+ export PATH="${makeBinPath [ cfg.steam.package ]}:$PATH"
+ exec -a wivrn-server ${serverCmdline}
+ ''
+ )
+ else
+ serverCmdline;
in
{
imports = [
@@ -184,6 +196,11 @@ in
IPC_EXIT_ON_DISCONNECT = "off";
PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = mkIf cfg.steam.importOXRRuntimes "1";
} cfg.monadoEnvironment;
+ # WiVRn scans for .desktop files in $XDG_DATA_DIRS for the application launcher,
+ # which will execute the command in Exec when selected in the headset. If the
+ # Exec path isn't absolute, it will be resolved relative to $PATH, so we must
+ # not override the value of $PATH.
+ enableDefaultPath = false;
serviceConfig = (
if cfg.highPriority then
{
@@ -211,8 +228,6 @@ in
RestrictSUIDSGID = true;
}
);
- # Needs Steam in the PATH to allow launching games from the headset
- path = mkIf cfg.steam.enable [ cfg.steam.package ];
wantedBy = mkIf cfg.autoStart [ "default.target" ];
restartTriggers = [
cfg.package
diff --git a/nixos/tests/web-apps/dashy.nix b/nixos/tests/web-apps/dashy.nix
index 39454b5b8d8a..d83c14d3294f 100644
--- a/nixos/tests/web-apps/dashy.nix
+++ b/nixos/tests/web-apps/dashy.nix
@@ -1,6 +1,5 @@
{ pkgs, lib, ... }:
let
-
customSettings = {
pageInfo = {
title = "My Custom Dashy Title";
@@ -45,29 +44,29 @@ in
}
];
};
- nodes = {
- machine = { };
+ containers = {
+ container = { };
- machine-custom = {
+ custom = {
services.dashy.settings = customSettings;
};
};
testScript = ''
start_all()
- machine.wait_for_unit("nginx.service")
- machine.wait_for_open_port(80)
+ container.wait_for_unit("nginx.service")
+ container.wait_for_open_port(80)
- actual = machine.succeed("curl -v --stderr - http://dashy.local/", timeout=10)
+ actual = container.succeed("curl -v --stderr - http://dashy.local/", timeout=10)
expected = "Dashy"
assert expected in actual, \
f"unexpected reply from Dashy, expected: '{expected}' got: '{actual}'"
- machine_custom.wait_for_unit("nginx.service")
- machine_custom.wait_for_open_port(80)
+ custom.wait_for_unit("nginx.service")
+ custom.wait_for_open_port(80)
- actual_custom = machine_custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip()
- expected_custom = machine_custom.succeed("cat ${customSettingsYaml}").strip()
+ actual_custom = custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip()
+ expected_custom = custom.succeed("cat ${customSettingsYaml}").strip()
assert expected_custom == actual_custom, \
f"unexpected reply from Dashy, expected: '{expected_custom}' got: '{actual_custom}'"
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 3d4138570f74..dd4df835a93c 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -480,13 +480,15 @@ let
# BUNDLE_WIDEVINE_CDM build flag does work in the way we want though.
# We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn
# flag (declare_args) so we simply hardcode it to false.
- ./patches/widevine-disable-auto-download-allow-bundle.patch
+ ./patches/${lib.optionalString (chromiumVersionAtLeast "150") "chromium-150-"}widevine-disable-auto-download-allow-bundle.patch
]
- ++ [
+ ++ lib.optionals (!chromiumVersionAtLeast "150") [
# Required to fix the build with a more recent wayland-protocols version
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
./patches/angle-wayland-include-protocol.patch
+ ]
+ ++ [
# Chromium reads initial_preferences from its own executable directory
# This patch modifies it to read /etc/chromium/initial_preferences
./patches/chromium-initial-prefs.patch
@@ -504,11 +506,16 @@ let
# allowing us to use our rustc and our clang.
./patches/chromium-140-rust.patch
]
- ++ lib.optionals (chromiumVersionAtLeast "141") [
+ ++ lib.optionals (versionRange "141" "150") [
# Rebased variant of the patch above due to
# https://chromium-review.googlesource.com/c/chromium/src/+/6897026
./patches/chromium-141-rust.patch
]
+ ++ lib.optionals (chromiumVersionAtLeast "150") [
+ # Rebased variant of the patch above due to
+ # https://chromium-review.googlesource.com/c/chromium/src/+/7858711
+ ./patches/chromium-150-rust.patch
+ ]
++ lib.optionals (!chromiumVersionAtLeast "145" && stdenv.hostPlatform.isAarch64) [
# Reverts decommit pooled pages which causes random crashes of tabs on systems
# with page sizes different than 4k. It 'supports' runtime page sizes, but has
@@ -676,6 +683,17 @@ let
revert = true;
hash = "sha256-7xg8IZ2gO+Wtnv7lWLVE3lLpcmMgvtDtcWwUuMBzkrE=";
})
+ ]
+ ++ lib.optionals (versionRange "150" "151") [
+ # ninja: Entering directory `out/Release'
+ # ninja: error: 'ar', needed by 'default_for_rust_host_build_tools/obj/build/rust/allocator/liballoc_error_handler_impl.a', missing and no known rule to make it
+ (fetchpatch {
+ name = "chromium-150-backport-build--Omit-ar-from-inputs-when-resolved-via--PATH.patch";
+ # https://chromium-review.googlesource.com/c/chromium/src/+/7904982
+ url = "https://chromium.googlesource.com/chromium/src/+/60f987d8d5f7272793a40290d060b8f50933f825^!?format=TEXT";
+ decode = "base64 -d";
+ hash = "sha256-MryWxSwBxSIONhl3X1cDxTWwNWy8a4yt/sqkrueSUNs=";
+ })
];
postPatch =
@@ -910,6 +928,12 @@ let
# TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md
use_clang_modules = false;
}
+ // lib.optionalAttrs (chromiumVersionAtLeast "150") {
+ # ERROR at //build/modules/BUILD.gn:80:23: Directory does not exist: /usr/include/
+ # system_headers += expand_directory("${sysroot}/${root_include_dir}", true)
+ # ^------------------------------------------------------
+ use_unified_system_module = false;
+ }
// {
use_qt5 = false;
use_qt6 = false;
@@ -986,24 +1010,34 @@ let
runHook postConfigure
'';
- # Chromium expects nightly/bleeding edge rustc features to be available.
- # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires
- # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to
- # enable those features in our stable builds.
- env.RUSTC_BOOTSTRAP = 1;
- # Mute some warnings that are enabled by default. This is useful because
- # our Clang is always older than Chromium's and the build logs have a size
- # of approx. 25 MB without this option (and this saves e.g. 66 %).
- env.NIX_CFLAGS_COMPILE =
- "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow"
- # warning: '_LIBCPP_HARDENING_MODE' macro redefined [-Wmacro-redefined]
- # because of hardeningDisable = [ "strictflexarrays1" ];
- + lib.optionalString (chromiumVersionAtLeast "149") " -Wno-macro-redefined";
- env.BUILD_CC = "$CC_FOR_BUILD";
- env.BUILD_CXX = "$CXX_FOR_BUILD";
- env.BUILD_AR = "$AR_FOR_BUILD";
- env.BUILD_NM = "$NM_FOR_BUILD";
- env.BUILD_READELF = "$READELF_FOR_BUILD";
+ env = {
+ # Chromium expects nightly/bleeding edge rustc features to be available.
+ # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires
+ # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to
+ # enable those features in our stable builds.
+ RUSTC_BOOTSTRAP = 1;
+
+ # Mute some warnings that are enabled by default. This is useful because
+ # our Clang is always older than Chromium's and the build logs have a size
+ # of approx. 25 MB without this option (and this saves e.g. 66 %).
+ NIX_CFLAGS_COMPILE =
+ "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow"
+ # warning: '_LIBCPP_HARDENING_MODE' macro redefined [-Wmacro-redefined]
+ # because of hardeningDisable = [ "strictflexarrays1" ];
+ + lib.optionalString (chromiumVersionAtLeast "149") " -Wno-macro-redefined";
+
+ BUILD_CC = "$CC_FOR_BUILD";
+ BUILD_CXX = "$CXX_FOR_BUILD";
+ BUILD_AR = "$AR_FOR_BUILD";
+ BUILD_NM = "$NM_FOR_BUILD";
+ BUILD_READELF = "$READELF_FOR_BUILD";
+ }
+ // lib.optionalAttrs (chromiumVersionAtLeast "150") {
+ # [56385/56385] LINK ./chrome
+ # FAILED: [code=1] chrome
+ # /nix/store/[...]/bin/ld.lld: line 288: /nix/store/[...]/bin/ld.lld: Argument list too long
+ NIX_LD_USE_RESPONSE_FILE = 1;
+ };
buildPhase =
let
diff --git a/pkgs/applications/networking/browsers/chromium/depot_tools.py b/pkgs/applications/networking/browsers/chromium/depot_tools.py
index ab8007a4e910..45f18098ff61 100755
--- a/pkgs/applications/networking/browsers/chromium/depot_tools.py
+++ b/pkgs/applications/networking/browsers/chromium/depot_tools.py
@@ -43,7 +43,14 @@ class Repo:
)
deps_file = self.get_file("DEPS")
- evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS")
+ evaluated = gclient_eval.Parse(
+ deps_file,
+ filename="DEPS",
+ vars_override=repo_vars,
+ # KeyError: "host_cpu was used as a variable, but was not declared in the vars dict (file 'DEPS', line 114)"
+ # https://chromium.googlesource.com/webpagereplay.git/+/b2b856131e36c99e9de9c419fe8ca02f857082ba/DEPS#114
+ builtin_vars= {"host_cpu": "*host_cpu_placeholder*"} if path == "src/third_party/webpagereplay" else None,
+ )
repo_vars = dict(evaluated.get("vars", {})) | repo_vars
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c87e4a647a90..6e075e7f9b3b 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,6 +1,6 @@
{
"chromium": {
- "version": "149.0.7827.200",
+ "version": "150.0.7871.46",
"chromedriver": {
"version": "149.0.7827.201",
"hash_darwin": "sha256-MHCcid+7wdYm8uIdrUIlXrk8ADHNUUXzPyMPFGP98WY=",
@@ -8,21 +8,21 @@
},
"deps": {
"depot_tools": {
- "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
- "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
+ "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
+ "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY="
},
"gn": {
- "version": "0-unstable-2026-05-01",
- "rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756",
- "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04="
+ "version": "0-unstable-2026-05-27",
+ "rev": "3357c4f51b1a9e676378c695dd9c7e9911c35ee6",
+ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
},
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
- "rev": "c35c164b1b6d1adca9eddf914ed6d0d0743dba6a",
- "hash": "sha256-b2gBRUzRjqVZEb/tWUL1JF6Afq5gHJ3aOM02My1FyYU=",
+ "rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb",
+ "hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -32,13 +32,13 @@
},
"src/third_party/compiler-rt/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
- "rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b",
- "hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM="
+ "rev": "03641f7a5b05e48e318d64369057db577cafc594",
+ "hash": "sha256-KnWESGG6aI0S+fkJ3/T1x4QSiIYaOOvWUAm6l6l9iME="
},
"src/third_party/libc++/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
- "rev": "be1c391acca009d8d80535ce924e3d285451cdfa",
- "hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc="
+ "rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11",
+ "hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM="
},
"src/third_party/libc++abi/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
@@ -47,13 +47,13 @@
},
"src/third_party/libunwind/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
- "rev": "71192be150bbe04d87bb5298512d464e38d2f654",
- "hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw="
+ "rev": "d6c7a21e978f0adaa43accaad53bc64f0b64f6ec",
+ "hash": "sha256-EuaVSYiR7qrlYqBR0UqdWCvwdzJSn0RS2wC/lnP19AE="
},
"src/third_party/llvm-libc/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
- "rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db",
- "hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M="
+ "rev": "6e5ec6f78d8b9f2e8a50fcc5692d1fc8b2964bde",
+ "hash": "sha256-qrkx8Z1fc088Ja32obIUPxDwklI7i1wdEw051UZ08u8="
},
"src/chrome/test/data/perf/canvas_bench": {
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
},
"src/docs/website": {
"url": "https://chromium.googlesource.com/website.git",
- "rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010",
- "hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY="
+ "rev": "3da515a67f412be05ea1ea6b39832a69aef8f54e",
+ "hash": "sha256-wrkFsPX7jrsjD/Ow1gna/xLvk0E49m5GVxP1G7Vx7HM="
},
"src/media/cdm/api": {
"url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,8 +82,8 @@
},
"src/net/third_party/quiche/src": {
"url": "https://quiche.googlesource.com/quiche.git",
- "rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8",
- "hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY="
+ "rev": "997d654308b6a1a17435e472ef5190aecb12e3eb",
+ "hash": "sha256-xgDgW2foZZEWpr0ibSG21kf028FN07/1ecOqFCkNj/I="
},
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -92,8 +92,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
- "rev": "355cc61af2aadd8f0494800325b2bf9908138108",
- "hash": "sha256-fgaCyO0oaz90aTaWMHH8ocySA0hXDHsPEl6vtMj4BY0="
+ "rev": "bbf3d8a4755268f016087be2f56099fa5a5f3f6e",
+ "hash": "sha256-8iuHtNgHumlMXeXj2k0ZPcvnTeJ00di298+789OjScs="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -107,13 +107,18 @@
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
- "rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b",
- "hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI="
+ "rev": "01471f4b3846c97eceb5b16b8acad950808791b2",
+ "hash": "sha256-SrL+G3osTtJGQslfCBEYbslb2kWtHRrwO87PHi+5o6E="
},
"src/third_party/anonymous_tokens/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
- "rev": "208ea23596884f6d86476ea88b64e7931cdec08a",
- "hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04="
+ "rev": "92d1fdf881a932e7aa2a9b20e006136a659c7a20",
+ "hash": "sha256-llPt+UR8hY0yaJkYmq+A3ZfRRReuaXN09qpap6C28jc="
+ },
+ "src/third_party/aria-practices/src": {
+ "url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git",
+ "rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc",
+ "hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc="
},
"src/third_party/readability/src": {
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -127,13 +132,13 @@
},
"src/third_party/dav1d/libdav1d": {
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
- "rev": "5cfc3832687e3229117203905faf5425ac6bc0d7",
- "hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I="
+ "rev": "62501cc7db378532d7e85ea434b70d57e1ba2cb0",
+ "hash": "sha256-5cpKTUnhR+QzQJR4KbAvdvqsWnT1fpH0g9MObv8Nx0c="
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
- "rev": "54b4153cfef88e048f365f99b962478f0087dfe8",
- "hash": "sha256-Bv30zz/pCNVzUl+mKCpusWc94poytv9ZFelZIcs+2B8="
+ "rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
+ "hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -142,8 +147,8 @@
},
"src/third_party/dawn/third_party/directx-shader-compiler/src": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
- "rev": "d73829d4e677ef00931e8e57de6d544396ab46cb",
- "hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w="
+ "rev": "35c1b99e9e552267da5efaea07c003e322d65777",
+ "hash": "sha256-pzBk+jUp/FUV8ahHquE0942Qw/DjAUemSM9fxdFJ0JA="
},
"src/third_party/dawn/third_party/directx-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -152,8 +157,8 @@
},
"src/third_party/dawn/third_party/OpenGL-Registry/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
- "rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb",
- "hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I="
+ "rev": "a30033d3e812c9bf10094f1010374a6b15e192eb",
+ "hash": "sha256-xLacUOSy783bCtv+wUnjVnNLwTQ3eLwUJtYXmELqekY="
},
"src/third_party/dawn/third_party/EGL-Registry/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
@@ -162,8 +167,8 @@
},
"src/third_party/dawn/third_party/webgpu-cts": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
- "rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4",
- "hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ="
+ "rev": "f08551b0fc4d6cfa5ba582a0235b571aa363102d",
+ "hash": "sha256-f5kWMnaod/Ved1Fz/vTkdL0ihSUnNM8XN5Ht3Vs1YpU="
},
"src/third_party/dawn/third_party/webgpu-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
@@ -187,8 +192,8 @@
},
"src/third_party/boringssl/src": {
"url": "https://boringssl.googlesource.com/boringssl.git",
- "rev": "65818adf16411ca394625f5747a1af28faf95d2c",
- "hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo="
+ "rev": "3a9254f16eda7a4c5d2260039ff23456a0a34de4",
+ "hash": "sha256-JuMnNppWhIFHYfk6ANIZLC7ABhqMseoV5LYV7slevBE="
},
"src/third_party/breakpad/breakpad": {
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
@@ -202,13 +207,8 @@
},
"src/third_party/catapult": {
"url": "https://chromium.googlesource.com/catapult.git",
- "rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641",
- "hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA="
- },
- "src/third_party/catapult/third_party/webpagereplay": {
- "url": "https://chromium.googlesource.com/webpagereplay.git",
- "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
- "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
+ "rev": "2852bb7e91e4995502ffb72b7ed21412ee157914",
+ "hash": "sha256-XYufVvzOXD4voZUWUvumQQqLNsx9sy0QmQzNzrgNEWg="
},
"src/third_party/ced/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -227,13 +227,13 @@
},
"src/third_party/cpu_features/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git",
- "rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b",
- "hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys="
+ "rev": "81d13c49649f0714dd41fb56bb246398b6584085",
+ "hash": "sha256-TrC1WMLAhko57rAyDCiAC/IJ0unAqVhyjkh7gKibyi4="
},
"src/third_party/cpuinfo/src": {
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
- "rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c",
- "hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="
+ "rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d",
+ "hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc="
},
"src/third_party/crc32c/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -242,28 +242,28 @@
},
"src/third_party/cros_system_api": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
- "rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f",
- "hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA="
+ "rev": "1c69e700a01a7fd3dd331f526c8a31ac1e5e49d0",
+ "hash": "sha256-qIwUs0KVU9xYFLN3UUayPLfz0ObA+EN6owKPW61J/5w="
},
"src/third_party/crossbench": {
"url": "https://chromium.googlesource.com/crossbench.git",
- "rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af",
- "hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o="
+ "rev": "7d52b4ffbc319a7d5a0e0a0ebff744e5281d60c5",
+ "hash": "sha256-iwwvvIOuRMo/ZEu8Gk0lZaS4P5uGt8zpnYMChpZPcUo="
},
"src/third_party/crossbench-web-tests": {
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
- "rev": "baf176aadedccc44329231d5dd40346874c2a63e",
- "hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw="
+ "rev": "7b3de17542cc613aaddbfc72c6e12be37eed7b73",
+ "hash": "sha256-7ly4vaK+Pj4y91t6Q+igQ0890CqKyu9jNBhJnxbNGjI="
},
"src/third_party/depot_tools": {
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
- "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
- "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
+ "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
+ "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY="
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
- "rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361",
- "hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0="
+ "rev": "1d67dc0dafa344bbd6ca75c124e2d6d9d53074d8",
+ "hash": "sha256-VBXch2YwnKm+lMcZ5L0SlW+vAYeaSwgZvcOhg1TE5/A="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -277,8 +277,8 @@
},
"src/third_party/eigen3/src": {
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
- "rev": "2cf9891537250255f50df5109ffe9e700e2a73de",
- "hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o="
+ "rev": "662ba79d796a2851b10cdafc6668e45b65b1120f",
+ "hash": "sha256-6bZFDeo7TqWNunkkQv8OJ+7/hfKwoIUtqZoXaeLp6M8="
},
"src/third_party/farmhash/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -287,18 +287,18 @@
},
"src/third_party/fast_float/src": {
"url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
- "rev": "05087a303dad9c98768b33c829d398223a649bc6",
- "hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A="
+ "rev": "cfd12ebcf1f82c4fd44a950b1815dd0549bc8d89",
+ "hash": "sha256-hzoB+Mmok3oe6B494uLc5ReWpUcB89zCGPYw4gvanK0="
},
"src/third_party/federated_compute/src": {
"url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
- "rev": "3112513bf1a80872311e7718c5385f535a819b89",
- "hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU="
+ "rev": "8de5837b817f28abc54a387a9417631b905ba90a",
+ "hash": "sha256-GZYo0FjgW8XCplAi6jzzruwDlIzsWjNEVQuCwXBCPz8="
},
"src/third_party/ffmpeg": {
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
- "rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0",
- "hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk="
+ "rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3",
+ "hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk="
},
"src/third_party/flac": {
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -327,8 +327,8 @@
},
"src/third_party/freetype/src": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
- "rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a",
- "hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4="
+ "rev": "b08a2eb0dd37f4a6c886fa5b0ecf5b3e1d27aac7",
+ "hash": "sha256-xnYeUAJx5n8LSg04AknfiudonfmlUdlj8nzHzSZi65I="
},
"src/third_party/fxdiv/src": {
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -337,13 +337,13 @@
},
"src/third_party/harfbuzz/src": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
- "rev": "e6741e2205309752839da60ff075b7fa2e7cddd3",
- "hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8="
+ "rev": "d639197ed529b05c27f38ebaab365a621d5edad5",
+ "hash": "sha256-uT4zK2hwHzEH6Nrd2rAeyzpQA1TmwtrdcujKYEUbLsY="
},
"src/third_party/ink/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
- "rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd",
- "hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k="
+ "rev": "0f9c6172b2ccc6b830ae313d522caf09e6933e06",
+ "hash": "sha256-LF+OcqNeg+KRuYmGuMZb4tmnr53sZHn/ZW1jg9ArPfc="
},
"src/third_party/instrumented_libs": {
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -367,8 +367,8 @@
},
"src/third_party/libgav1/src": {
"url": "https://chromium.googlesource.com/codecs/libgav1.git",
- "rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc",
- "hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo="
+ "rev": "66ac17620652635392f6ab24065c77b035e281c9",
+ "hash": "sha256-6/zMaX2DPSKpsaqirhrgi3nL/88Qr2VXacmyL5IyJ3U="
},
"src/third_party/googletest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
@@ -392,8 +392,8 @@
},
"src/third_party/jsoncpp/source": {
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
- "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
- "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q="
+ "rev": "d4d072177213b117fb81d4cfda140de090616161",
+ "hash": "sha256-q+DOwkjRlHacgfWf5UVY02aqfnKK9M/1YRBX6aMce9g="
},
"src/third_party/leveldatabase/src": {
"url": "https://chromium.googlesource.com/external/leveldb.git",
@@ -407,8 +407,8 @@
},
"src/third_party/fuzztest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
- "rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be",
- "hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk="
+ "rev": "da27bcae1a8902af1ae6a5c55d3674f22709bbf5",
+ "hash": "sha256-317zRhJPc0D9A58W8fdCGFmpNZ5vACfd/tlZOsp/Cvw="
},
"src/third_party/domato/src": {
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -417,18 +417,18 @@
},
"src/third_party/libaddressinput/src": {
"url": "https://chromium.googlesource.com/external/libaddressinput.git",
- "rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5",
- "hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4="
+ "rev": "81eb9628382b07d371d8ea0b11badf7de3857fd5",
+ "hash": "sha256-6yDZpZ+CwxGqNO4+lZLFB6ESREeVku1BoOMtR+hKQ3I="
},
"src/third_party/libaom/source/libaom": {
"url": "https://aomedia.googlesource.com/aom.git",
- "rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a",
- "hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs="
+ "rev": "137bcff61e73fdd2836dc04e8258bfb49cef595e",
+ "hash": "sha256-oDubKvgqMk3w0luM//rR3NnCOk1h/WVTyRkuCmYASrw="
},
"src/third_party/crabbyavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
- "rev": "c433c9a32320aed983e4106931596fbbae3f77ee",
- "hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q="
+ "rev": "5e140b5abb9a91eb25b5ef66d29f6ee784ab7eab",
+ "hash": "sha256-tN+2YH2O9FTV50o4OVhKcKdwRwTI8NuNA0WqljUcrmo="
},
"src/third_party/nearby/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
@@ -442,8 +442,8 @@
},
"src/third_party/jetstream/main": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
- "rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842",
- "hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8="
+ "rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a",
+ "hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0="
},
"src/third_party/jetstream/v2.2": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -482,8 +482,8 @@
},
"src/third_party/cros-components/src": {
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
- "rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57",
- "hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k="
+ "rev": "0abb2efaa3d16db861c9710b193c39e657ac3bdf",
+ "hash": "sha256-viuntf6umyLZwDR9BXG+ZOakp9f8rvpZYDBYAUkKzL4="
},
"src/third_party/libdrm/src": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -492,8 +492,8 @@
},
"src/third_party/expat/src": {
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
- "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a",
- "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc="
+ "rev": "9bdfbc77e3355405ceefbe59420abed953a5657e",
+ "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU="
},
"src/third_party/libipp/libipp": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git",
@@ -502,8 +502,8 @@
},
"src/third_party/libjpeg_turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
- "rev": "d1f5f2393e0d51f840207342ae86e55a86443288",
- "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM="
+ "rev": "640f254ad0fa03f6b1f29f89b7dd9366f2f6e533",
+ "hash": "sha256-wor4RTF3/5BFL9EWcGEofY+M4HN2+/KJUaOY+u86K5Q="
},
"src/third_party/liblouis/src": {
"url": "https://chromium.googlesource.com/external/liblouis-github.git",
@@ -512,8 +512,8 @@
},
"src/third_party/libphonenumber/src": {
"url": "https://chromium.googlesource.com/external/libphonenumber.git",
- "rev": "ade546d8856475d0493863ee270eb3be9628106b",
- "hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg="
+ "rev": "c25558e39e2bcc9f26f7a2a1ef804324169eaf8f",
+ "hash": "sha256-Lr/gB5Em+TE092McPwJdOU0Ab4zyP4/2ZxlavMZMm+s="
},
"src/third_party/libprotobuf-mutator/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
@@ -537,8 +537,8 @@
},
"src/third_party/libvpx/source/libvpx": {
"url": "https://chromium.googlesource.com/webm/libvpx.git",
- "rev": "d1268a5f3f3553ad7735911c614e8548381ca3cd",
- "hash": "sha256-6IZTDhtjVWiqTv+jUC6Wr/tSqvql3thi9+mt+M3ixt4="
+ "rev": "5f00413667d19ad683674524a9d03543d86d188b",
+ "hash": "sha256-uTteQ+z7t5KOtPuBoZazmonRHd8jGS1/YZAq+RAvhX4="
},
"src/third_party/libwebm/source": {
"url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -552,8 +552,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
- "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8",
- "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4="
+ "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272",
+ "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -572,8 +572,8 @@
},
"src/third_party/nasm": {
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
- "rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f",
- "hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc="
+ "rev": "525a09a813be0f75b646ee93fc2a31c27b87d722",
+ "hash": "sha256-uC6bGxSdz1V2SXIQjMsDd6555b3gAPN1Y0ZQtWoqDww="
},
"src/third_party/neon_2_sse/src": {
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -587,8 +587,8 @@
},
"src/third_party/openscreen/src": {
"url": "https://chromium.googlesource.com/openscreen",
- "rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e",
- "hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE="
+ "rev": "37ff938a93cb04c6b77e019b52328c8e9b320317",
+ "hash": "sha256-M57un/TVQPfTnKScVHS1VK1cUs8F/YPT3TwMVdo+mhM="
},
"src/third_party/openscreen/src/buildtools": {
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -602,13 +602,13 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
- "rev": "be702d63baba7507bb1f6f6ff2d35be9c133c08c",
- "hash": "sha256-hXqSJn1C0ISLWx68UicggiL8xzgQX2Y8l75vtpJgHeU="
+ "rev": "c052afb72a08d79a26bcf3103d11f344981b09f1",
+ "hash": "sha256-zqfErp0pDXHXIvRpZ1TJu2UGXNZjATRbPgQWTniKTJs="
},
"src/third_party/perfetto": {
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
- "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f",
- "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38="
+ "rev": "9ede949f025303868fa0c42418f122ac47312539",
+ "hash": "sha256-IRzEqgunO4Nfz+FkYir8G/Ht+Zsn6wpzncgkEFpsC+k="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -617,8 +617,8 @@
},
"src/third_party/pthreadpool/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
- "rev": "a56dcd79c699366e7ac6466792c3025883ff7704",
- "hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY="
+ "rev": "02460584c6092e527c8b89f7df4de143d70e801f",
+ "hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
},
"src/third_party/pyelftools": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -647,13 +647,18 @@
},
"src/third_party/search_engines_data/resources": {
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
- "rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67",
- "hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ="
+ "rev": "1aab872af8d44dcf59362d7ba8255922f74fafde",
+ "hash": "sha256-5/XnNx6Pyk4KBb9krVo9u6i7LWNrsLLOIi4qhEY2PZc="
+ },
+ "src/third_party/sframe/src": {
+ "url": "https://chromium.googlesource.com/external/github.com/cisco/sframe",
+ "rev": "b14090904433bed0d4ec3f875b9b39f3e0555930",
+ "hash": "sha256-bw+6ycUpnFZJhtXFUzr7XTOljNrs+7oFdVY+LN0Rqek="
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
- "rev": "75c589e1f436688fca8f5b7f7a8affeafaa4f923",
- "hash": "sha256-x0jEek7iJv7WBNdkOUPc5VvIYJw9QPzzTChFUofqErM="
+ "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0",
+ "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -667,13 +672,13 @@
},
"src/third_party/sqlite/src": {
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
- "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239",
- "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg="
+ "rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181",
+ "hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo="
},
"src/third_party/swiftshader": {
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
- "rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305",
- "hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o="
+ "rev": "fce27a96526f54c6d31fdccf57629788e3712220",
+ "hash": "sha256-bmXZLpz3wv7eQWoqTjZmjwnnILWSIjZ8iqo8CeLk5fw="
},
"src/third_party/text-fragments-polyfill/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -682,23 +687,23 @@
},
"src/third_party/tflite/src": {
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
- "rev": "2216f531fb72119745382c62f232acf9790f4b6e",
- "hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI="
+ "rev": "999d49c10046e240cd5366d349d3a5f6af16a0d4",
+ "hash": "sha256-eSqaWXtzZ4Bi9ilaJYGdZamzUjmo+AtDZ9KeZhsc/fY="
},
"src/third_party/litert/src": {
"url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
- "rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0",
- "hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts="
+ "rev": "09b4b05203fd7a9402ffcce9cc736d887ff7e3fc",
+ "hash": "sha256-skMOzpsn67mmOAp7Mf6UrJdi2lbiQQ8b6kBy4Ik2ED8="
},
"src/third_party/vulkan-deps": {
"url": "https://chromium.googlesource.com/vulkan-deps",
- "rev": "d234b7b29748c07ef389279dd24f533ebd04cadc",
- "hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk="
+ "rev": "669a28b1f31f89bfc46b74791f127bcc5e5b2f06",
+ "hash": "sha256-lsR+sh+XQP/wKgkBbie6Gp+kQNFnnC8TeNWpiWTdevw="
},
"src/third_party/glslang/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
- "rev": "458ff50a67cb69371850068a62b78f1990a1ff9a",
- "hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw="
+ "rev": "f6d9303ddaf2e879b9155f7186cd234f5a79079c",
+ "hash": "sha256-ru3QVyyyqxZRcvSpy9pYhHHhkjuLVhQbgOT/vQJ/oIw="
},
"src/third_party/spirv-cross/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -707,43 +712,43 @@
},
"src/third_party/spirv-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
- "rev": "126038020c2bd47efaa942ccc364ca5353ffccde",
- "hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc="
+ "rev": "1e770e7de8373a8dd49f23416cf7ca4001d01040",
+ "hash": "sha256-t8Shkoa90TJt1MbTOefnLaguW4eYKsRFO1Jd0AUc70Y="
},
"src/third_party/spirv-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
- "rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f",
- "hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q="
+ "rev": "b38c4f83024546d4000b2db8e2294cf81b7f26e0",
+ "hash": "sha256-q5G4B75xBIXl1aG/vzbIDrc3Hs/MFoQ4nwh4ozb8hys="
},
"src/third_party/vulkan-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
- "rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8",
- "hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ="
+ "rev": "015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9",
+ "hash": "sha256-pUxPwFGbOzP8ymTooeA1slFWEFsRoqUROSnndVtLiY8="
},
"src/third_party/vulkan-loader/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
- "rev": "15a84652b94e465e9a7b25eb507193929863bc2f",
- "hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84="
+ "rev": "cf0cf82ea16c0ff0be75940f282540d6085b2d3b",
+ "hash": "sha256-uyoysS7lSBNDRfvcwPT+gQqhE20UxiYUEw1UXnYS3fY="
},
"src/third_party/vulkan-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
- "rev": "7c46da2b39036a80ce088576d5794bf39e667f56",
- "hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw="
+ "rev": "e3d18f90c0b8ef1f52539e0674a42f0adfe30381",
+ "hash": "sha256-Hs9N0FM3eWWjLm4BrDJoZIrsPDVFx0iRAJeQ4gHTM7o="
},
"src/third_party/vulkan-utility-libraries/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
- "rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead",
- "hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho="
+ "rev": "8383c46b129c2b3a5f3833e602d946d2fcc57e39",
+ "hash": "sha256-ZBie5uDTVEehxRQW1GZY5Ki/bnp82LoW3jfMUFL0O9A="
},
"src/third_party/vulkan-validation-layers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
- "rev": "b105d8ea361af258abed65efb5a1565c031dcf1c",
- "hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk="
+ "rev": "044eaba8a34a6e3bfb1d6aafac7c01068813a2b6",
+ "hash": "sha256-i3hochkK0LZPg8CsZMFkAL+8tf8QuuwtApAc4FDd0RM="
},
"src/third_party/vulkan_memory_allocator": {
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
- "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
- "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo="
+ "rev": "7e55b011e16182fc349149abbd3aaf3b1db46421",
+ "hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI="
},
"src/third_party/wayland/src": {
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -777,18 +782,23 @@
},
"src/third_party/webgpu-cts/src": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
- "rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3",
- "hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I="
+ "rev": "b507bd117e53db86f2fb52d0d858d3ae7d684a85",
+ "hash": "sha256-6Y5Z0ErtsZdbuWTHa+PEiOxcZSbjBcnuOHbgtI1/+80="
},
"src/third_party/webpagereplay": {
"url": "https://chromium.googlesource.com/webpagereplay.git",
- "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
- "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
+ "rev": "b2b856131e36c99e9de9c419fe8ca02f857082ba",
+ "hash": "sha256-+hcaP7C5Eh3SLl5B8mRgOVdM/tvnFnb/oqUIWPoe0NA="
+ },
+ "src/third_party/webpagereplay/third_party/clang-format/script": {
+ "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
+ "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
+ "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
- "rev": "28311abc149a9bb7e6761a3d54f362a8d77e6793",
- "hash": "sha256-WuaxKrbISJ1nwyoj2sPAhGCNz33xEYSX1WlDiM+zxpw="
+ "rev": "1f975dfd761af6e5d76d28333191973b258d82a8",
+ "hash": "sha256-ucH+9HBkFyOKEItAWVoYmEzyU7h/UgWIvp/eC/JqGWU="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -802,8 +812,8 @@
},
"src/third_party/xnnpack/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
- "rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80",
- "hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg="
+ "rev": "56ac34b3f45fae2eca1f32584f7f0b279be2cf1f",
+ "hash": "sha256-uw3r5g5rWamlFubBkXDb4KRx3hkOAoQyFo8l95GYGZI="
},
"src/third_party/libei/src": {
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
@@ -812,13 +822,18 @@
},
"src/third_party/zstd/src": {
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
- "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f",
- "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg="
+ "rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc",
+ "hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8="
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
- "rev": "933ce636c562cd54d68e7f7c93ab5cdffd685fca",
- "hash": "sha256-zYArO6QS9nDIVWPINRVaDN1uX8X/wchBDeZHPZnwHYk="
+ "rev": "968f19a8970f8d91702d86f0ec1522f3909781b7",
+ "hash": "sha256-x3rCWvC3hEjyJq6PNThhZEp4oRF9Y1JJEPnZTqVNVrY="
+ },
+ "src/agents/shared": {
+ "url": "https://chromium.googlesource.com/chromium/agents.git",
+ "rev": "e75efa515896f6bf1dea92eaffbcf8ee711a65d8",
+ "hash": "sha256-z2GrzF8jDkdfBdq1HP3gTgQpoqjmhc80kEZBmlue0os="
}
}
},
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch
new file mode 100644
index 000000000000..113097a87be8
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch
@@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index e1da11405c1f667280099ee815abc5349d1ad1bd..202992dbbe1c2a70eb6d8b559568d388f98b28f6 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1678,16 +1678,6 @@ config("runtime_library") {
+ configs += [ "//build/config/c++:runtime_library" ]
+ }
+
+- # Rust and C++ both provide intrinsics for LLVM to call for math operations.
+- # We want to use the C++ intrinsics, not the ones in the Rust
+- # compiler_builtins library. The Rust symbols are marked as weak, so that they
+- # can be replaced by the C++ symbols. This config ensures the C++ symbols
+- # exist and are strong in order to cause that replacement to occur by
+- # explicitly linking in clang's compiler-rt library.
+- if (is_clang && !(is_a_target_toolchain && is_cronet_build)) {
+- configs += [ "//build/config/clang:compiler_builtins" ]
+- }
+-
+ # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+ # configuration.
+ if (is_posix || is_fuchsia) {
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch
new file mode 100644
index 000000000000..84926ab177b3
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch
@@ -0,0 +1,27 @@
+diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
+index 6d18f9fa163718d95610de9b6229dd38478543c7..93884543edcaa7211f4a7d61175bc068c6fd7dd4 100644
+--- a/third_party/widevine/cdm/BUILD.gn
++++ b/third_party/widevine/cdm/BUILD.gn
+@@ -19,7 +19,7 @@ buildflag_header("buildflags") {
+
+ flags = [
+ "ENABLE_WIDEVINE=$enable_widevine",
+- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
++ "BUNDLE_WIDEVINE_CDM=true",
+ "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
+ "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm",
+ ]
+diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni
+index 927b2e4809cf76e6b3ef51ee6cd2bbd04a92d60b..41761d10a4105a20fc4acf35f761c7ab23f867dd 100644
+--- a/third_party/widevine/cdm/widevine.gni
++++ b/third_party/widevine/cdm/widevine.gni
+@@ -40,8 +40,7 @@ enable_library_widevine_cdm =
+ # Widevine CDM can be deployed as a component. Currently only supported on
+ # desktop platforms. The CDM can be bundled regardless whether it's a
+ # component. See below.
+-enable_widevine_cdm_component =
+- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos)
++enable_widevine_cdm_component = false
+
+ # Enable (Windows) Media Foundation Widevine CDM component.
+ declare_args() {
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 92ba7b5ddf05..983890fbc3c0 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -2,7 +2,6 @@
buildGoModule,
fetchFromGitHub,
lib,
- yq-go,
nix-update-script,
}:
@@ -22,21 +21,29 @@ buildGoModule {
vendorHash = "sha256-4ckjM520MGYb64LbjYURe7AIScm4aGbj81rGKSSYaAo=";
- # NOTE: Remove the install and upgrade hooks.
postPatch = ''
- sed -i '/^hooks:/,+2 d' plugin.yaml
+ # Remove the install and upgrade hooks.
+ sed -i '/^platformHooks:[[:space:]]*$/,/^[^[:space:]]/d' plugin.yaml
+ # Remove the per-platform commands
+ sed -i '/^platformCommand:[[:space:]]*$/,/^[^[:space:]]/d' plugin.yaml
+ # Add a simple runtime config
+ cat <<'EOF' >> ./plugin.yaml
+ platformCommand:
+ - command: "''$HELM_PLUGIN_DIR/helm-unittest"
+ EOF
'';
- postInstall = ''
- install -dm755 $out/helm-unittest
- mv $out/bin/helm-unittest $out/helm-unittest/untt
- rmdir $out/bin
- install -m644 -Dt $out/helm-unittest plugin.yaml
- '';
+ subPackages = [ "cmd/helm-unittest" ];
- nativeCheckInputs = [
- yq-go
- ];
+ installPhase = ''
+ runHook preInstall
+
+ install -dm755 "$out/helm-unittest"
+ install -m755 -Dt "$out/helm-unittest" "$GOPATH/bin/helm-unittest"
+ install -m644 -Dt "$out/helm-unittest" ./plugin.yaml
+
+ runHook postInstall
+ '';
passthru = {
updateScript = nix-update-script { };
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 21f19b0f1323..f09df527aea4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -91,8 +91,8 @@ rec {
thunderbird-140 = common {
applicationName = "Thunderbird ESR";
- version = "140.12.0esr";
- sha512 = "ccbcc305d5cc10aa01aa5071f40a21b42de0300d9ad6763c4fc4ad71bf797566f2380c8fd84d46952e7c4eae0a35905173e6906b108192833660eae2ceea7b51";
+ version = "140.12.1esr";
+ sha512 = "24e795483ba7bc112c0debe1becdaf79cc2de95703b9ee726d0216bfc1db7b33c169503f83ac867e5998a8d1d0284a6ef12c7d35d98b10d6432497c2db237477";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-140";
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index 27dc09810161..c0da66554a81 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -7,6 +7,7 @@
pkg-config,
wrapQtAppsHook,
nix-update-script,
+ grim,
hyprland,
hyprland-protocols,
hyprlang,
@@ -81,7 +82,12 @@ stdenv.mkDerivation (finalAttrs: {
}
wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
- --prefix PATH ":" ${lib.makeBinPath [ (placeholder "out") ]}
+ --prefix PATH ":" ${
+ lib.makeBinPath [
+ (placeholder "out")
+ grim
+ ]
+ }
'';
passthru = {
diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix
index 775a034e64e0..f55cec22d687 100644
--- a/pkgs/by-name/_4/_4ti2/package.nix
+++ b/pkgs/by-name/_4/_4ti2/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "4ti2";
- version = "1.6.14";
+ version = "1.6.15";
src = fetchFromGitHub {
owner = "4ti2";
repo = "4ti2";
tag = "Release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
- hash = "sha256-bFvq90hLLGty7p6NLxOARVvKdizg3bp2NkP9nZpVFzQ=";
+ hash = "sha256-6X8zNp68KlKxplg1rdcotmXyIZE27POJs9/3n2BZLZE=";
};
postPatch = ''
diff --git a/pkgs/by-name/ab/abtop/package.nix b/pkgs/by-name/ab/abtop/package.nix
new file mode 100644
index 000000000000..725caaea0152
--- /dev/null
+++ b/pkgs/by-name/ab/abtop/package.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ versionCheckHook,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "abtop";
+ version = "0.5.1";
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "graykode";
+ repo = "abtop";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-2m0FYv2HouFqnmDaG6ounc8VJxlEK3N3uTBZyNiFwzI=";
+ };
+
+ cargoHash = "sha256-0sAjql2pH41dHdmV0uC4jjj6J1OFjMdEY1B+4C4id3Y=";
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Like htop, but for AI coding agents";
+ homepage = "https://github.com/graykode/abtop";
+ changelog = "https://github.com/graykode/abtop/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ Br1ght0ne ];
+ mainProgram = "abtop";
+ };
+})
diff --git a/pkgs/by-name/an/anki/addons/advanced-browser/default.nix b/pkgs/by-name/an/anki/addons/advanced-browser/default.nix
new file mode 100644
index 000000000000..6b1871240da2
--- /dev/null
+++ b/pkgs/by-name/an/anki/addons/advanced-browser/default.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ anki-utils,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+anki-utils.buildAnkiAddon (finalAttrs: {
+ pname = "advanced-browser";
+ version = "4.5";
+ src = fetchFromGitHub {
+ owner = "AnKing-VIP";
+ repo = "advanced-browser";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-oVL+Y96/d+uD8s6yjz6L7zWV2G6PgP7ZfIiEAAZR2T4=";
+ };
+ passthru.updateScript = nix-update-script { };
+ meta = {
+ description = "Adds more sorting options to the browser";
+ longDescription = ''
+ A general overview of the functionality can be found [here](https://ankiweb.net/shared/info/874215009).
+ The options to configure this add-on can be found [here](https://github.com/AnKing-VIP/advanced-browser/blob/v${finalAttrs.version}/advancedbrowser/config.md).
+ '';
+ homepage = "https://ankiweb.net/shared/info/874215009";
+ downloadPage = "https://github.com/AnKing-VIP/advanced-browser";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ n0pl4c3 ];
+ };
+})
diff --git a/pkgs/by-name/an/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix
index 7aadfabde19d..7645d7a9967a 100644
--- a/pkgs/by-name/an/anki/addons/default.nix
+++ b/pkgs/by-name/an/anki/addons/default.nix
@@ -4,6 +4,8 @@
{
adjust-sound-volume = callPackage ./adjust-sound-volume { };
+ advanced-browser = callPackage ./advanced-browser { };
+
ajt-card-management = callPackage ./ajt-card-management { };
anki-connect = callPackage ./anki-connect { };
diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix
index bfa33693cb21..4c2153083154 100644
--- a/pkgs/by-name/av/avml/package.nix
+++ b/pkgs/by-name/av/avml/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "avml";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "avml";
tag = "v${finalAttrs.version}";
- hash = "sha256-d8H+UPCH3yyBNndlGzamgaPlhmvP4rcUSAywx8vYky0=";
+ hash = "sha256-2oVqweq06pzFVcUVq1lCJ4rGmiZG0A7xq6g1RSwR12M=";
};
- cargoHash = "sha256-LxoyvjFVn69s9Wf8pF+9wBgOV4fJ/th6GPzLW6hbz0E=";
+ cargoHash = "sha256-40NKzbxNY9t5e7OJnw9Kfvx86YsPAolcezeWeFsD0C4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ba/bambuddy/package.nix b/pkgs/by-name/ba/bambuddy/package.nix
new file mode 100644
index 000000000000..f18e9781c66f
--- /dev/null
+++ b/pkgs/by-name/ba/bambuddy/package.nix
@@ -0,0 +1,121 @@
+{
+ fetchFromGitHub,
+ buildNpmPackage,
+ python3,
+ stdenv,
+ makeWrapper,
+ lib,
+ ffmpeg,
+}:
+let
+ version = "0.2.4.8";
+
+ src = fetchFromGitHub {
+ owner = "maziggy";
+ repo = "bambuddy";
+ tag = "v${version}";
+ hash = "sha256-6qeIidvi62NUok7I9UQ8DblT0/Wscju4FMnVuPXzMdM=";
+ };
+
+ frontend = buildNpmPackage {
+ pname = "bambuddy-frontend";
+ inherit version src;
+
+ sourceRoot = "${src.name}/frontend";
+ npmDepsHash = "sha256-/22FkXus5f3wYivyadZWU6ZKPYFLF8xA8mkVGxvdXm0=";
+
+ preBuild = "chmod -R u+w ../static";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r ../static/. $out/
+
+ runHook postInstall
+ '';
+ };
+
+ # https://github.com/maziggy/bambuddy/blob/main/requirements.txt
+ python = python3.withPackages (
+ ps: with ps; [
+ aiofiles
+ aioftp
+ aiosqlite
+ asyncpg
+ asyncssh
+ bcrypt
+ cryptography
+ curl-cffi
+ defusedxml
+ fastapi
+ fast-simplification
+ greenlet
+ httpx
+ ldap3
+ lxml
+ matplotlib
+ networkx
+ numpy
+ opencv4
+ openpyxl
+ paho-mqtt
+ passlib
+ pillow
+ psutil
+ pydantic
+ pydantic-settings
+ pyftpdlib
+ pyjwt
+ pyopenssl
+ pyotp
+ python-multipart
+ pywebpush
+ qrcode
+ reportlab
+ sqlalchemy
+ trimesh
+ uvicorn
+ websockets
+ ]
+ );
+in
+stdenv.mkDerivation {
+ pname = "bambuddy";
+ inherit version src;
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/lib/bambuddy
+ cp -r . $out/lib/bambuddy/
+
+ rm -rf $out/lib/bambuddy/static
+ ln -s ${frontend} $out/lib/bambuddy/static
+
+ mkdir -p $out/bin
+
+ makeWrapper ${lib.getExe' python "uvicorn"} $out/bin/bambuddy \
+ --chdir "$out/lib/bambuddy" \
+ --prefix PYTHONPATH : "$out/lib/bambuddy" \
+ --prefix PATH : ${ffmpeg}/bin \
+ --add-flags "backend.app.main:app"
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Self-hosted command center for Bambu Lab";
+ homepage = "https://bambuddy.cool/";
+ changelog = "https://github.com/maziggy/bambuddy/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.agpl3Only;
+ maintainers = with lib.maintainers; [ onatustun ];
+ mainProgram = "bambuddy";
+ platforms = with lib.platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/by-name/be/bencher-cli/package.nix b/pkgs/by-name/be/bencher-cli/package.nix
new file mode 100644
index 000000000000..4145952c6736
--- /dev/null
+++ b/pkgs/by-name/be/bencher-cli/package.nix
@@ -0,0 +1,80 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ mold,
+ nix-update-script,
+ versionCheckHook,
+ rustc,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "bencher-cli";
+ version = "0.6.8";
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ src = fetchFromGitHub {
+ owner = "bencherdev";
+ repo = "bencher";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-MlRj56QXRrvfBxi6+B6vpEKlDWMFB+V1CzQYOiGFpHE=";
+ };
+
+ cargoHash = "sha256-biCHEePgVxrnGUj94bwWrp9GVhspiMjcMRdp3A7O2h0=";
+
+ nativeBuildInputs = [ mold ];
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
+ cargoBuildFlags = [ "--package=bencher_cli" ];
+ cargoTestFlags = [ "--package=bencher_cli" ];
+ # Build the open-source version
+ buildNoDefaultFeatures = true;
+ checkNoDefaultFeatures = finalAttrs.buildNoDefaultFeatures;
+
+ postPatch = lib.optionalString finalAttrs.buildNoDefaultFeatures ''
+ # Replaces the proprietary Rust files with empty files
+ # This is just a safeguard, the build shouldn't touch these files anyways
+ echo "find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} +"
+ find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} +
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Command-Line interface for the Bencher continuous benchmarking platform";
+ mainProgram = "bencher";
+ longDescription = ''
+ Bencher is a suite of continuous benchmarking tools.
+ Bencher allows you to detect and prevent performance regressions
+ *before* they hit production.
+
+ - Run: Run your benchmarks locally or in CI using your favorite
+ benchmarking tools. The bencher CLI simply wraps your existing
+ benchmark harness and stores its results.
+ - Track: Track the results of your benchmarks over time. Monitor, query,
+ and graph the results using the Bencher web console based on the source
+ branch, testbed, benchmark, and measure.
+ - Catch: Catch performance regressions in CI. Bencher uses state of the
+ art, customizable analytics to detect performance regressions before
+ they make it to production.
+
+ Bencher's source repo includes non-free features, included in the build
+ as the Cargo feature "plus".
+ Files in the plus directories are proprietary, while the other files
+ are dual Apache-2.0/MIT licensed.
+ The Nix derivation does not compile the proprietary features.
+ '';
+ homepage = "https://bencher.dev";
+ license =
+ if finalAttrs.buildNoDefaultFeatures then
+ lib.licenses.OR [
+ lib.licenses.asl20
+ lib.licenses.mit
+ ]
+ else
+ lib.licenses.unfree;
+ platforms = rustc.meta.platforms;
+ maintainers = [ lib.maintainers.skyesoss ];
+ };
+})
diff --git a/pkgs/by-name/br/breseq/package.nix b/pkgs/by-name/br/breseq/package.nix
new file mode 100644
index 000000000000..589c5ddeed20
--- /dev/null
+++ b/pkgs/by-name/br/breseq/package.nix
@@ -0,0 +1,94 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ callPackage,
+ nix-update-script,
+ libz,
+ libtool,
+ perl,
+ R,
+ bowtie2,
+ which,
+ ghostscript,
+ makeWrapper,
+ autoreconfHook,
+ versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "breseq";
+ version = "0.39.0";
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "barricklab";
+ repo = "breseq";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-DsDX2oGn7Ex50Wnp1phJjCziCzZIeeZOHriUGJbejsk=";
+ };
+
+ buildInputs = [
+ perl
+ libz
+ libtool
+ ];
+
+ nativeBuildInputs = [
+ makeWrapper
+ autoreconfHook
+ ];
+
+ postInstall = ''
+ # Make wrappers
+ wrapProgram $out/bin/breseq --prefix PATH : ${
+ lib.makeBinPath [
+ which
+ ghostscript
+ bowtie2
+ R
+ ]
+ }
+ wrapProgram $out/bin/gdtools --prefix PATH : ${
+ lib.makeBinPath [
+ which
+ ghostscript
+ bowtie2
+ R
+ ]
+ }
+ # Copy over tests (incl necessary datasets) and license
+ cp LICENSE $out/license
+ mkdir $out/tests
+ mkdir $out/tests/data
+ cp tests/data/tmv_plasmid $out/tests/data/tmv_plasmid -r
+ cp tests/data/lambda $out/tests/data/lambda -r
+ cp tests/common.sh $out/tests/common.sh
+ cp tests/tmv_plasmid_circular_deletion $out/tests/tmv_plasmid_circular_deletion -r
+ cp tests/gdtools_compare_1 $out/tests/gdtools_compare_1 -r
+ '';
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ doInstallCheck = true;
+
+ passthru.tests = {
+ breseq_works = callPackage ./tests/breseq.nix { };
+ gdtools_works = callPackage ./tests/gdtools.nix { };
+ };
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Computational pipeline for finding mutations relative to a reference sequence in short-read DNA re-sequencing data";
+ mainProgram = "breseq";
+ homepage = "https://github.com/barricklab/breseq";
+ license = with lib.licenses; [
+ gpl2Plus # See barricklab/breseq#398
+ ];
+ maintainers = with lib.maintainers; [ croots ];
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/by-name/br/breseq/tests/breseq.nix b/pkgs/by-name/br/breseq/tests/breseq.nix
new file mode 100644
index 000000000000..0b0975206373
--- /dev/null
+++ b/pkgs/by-name/br/breseq/tests/breseq.nix
@@ -0,0 +1,21 @@
+{
+ runCommand,
+ breseq,
+}:
+
+let
+ inherit (breseq) pname version;
+in
+
+runCommand "breseq-tests" { meta.timeout = 60; } ''
+ echo "Testing breseq - breseq executable"
+ export TESTBINPREFIX=${breseq}/bin
+ cp ${breseq}/tests $PWD/breseqtests -r
+ chmod -R +w $PWD/breseqtests
+ output=$($PWD/breseqtests/tmv_plasmid_circular_deletion/testcmd.sh 2>&1) || {
+ echo "$output"
+ echo "Error testing breseq - breseq executable"
+ exit 1
+ }
+ touch $out
+''
diff --git a/pkgs/by-name/br/breseq/tests/gdtools.nix b/pkgs/by-name/br/breseq/tests/gdtools.nix
new file mode 100644
index 000000000000..fbb78e221d97
--- /dev/null
+++ b/pkgs/by-name/br/breseq/tests/gdtools.nix
@@ -0,0 +1,21 @@
+{
+ runCommand,
+ breseq,
+}:
+
+let
+ inherit (breseq) pname version;
+in
+
+runCommand "breseq-tests" { meta.timeout = 60; } ''
+ echo "Testing breseq - gdtools executable"
+ export TESTBINPREFIX=${breseq}/bin
+ cp ${breseq}/tests $PWD/breseqtests -r
+ chmod -R +w $PWD/breseqtests
+ output=$($PWD/breseqtests/gdtools_compare_1/testcmd.sh 2>&1) || {
+ echo "$output"
+ echo "Error testing breseq - gdtools executable"
+ exit 1
+ }
+ touch $out
+''
diff --git a/pkgs/by-name/bu/butane/package.nix b/pkgs/by-name/bu/butane/package.nix
index 82608d31e5d5..7897a9b2d95d 100644
--- a/pkgs/by-name/bu/butane/package.nix
+++ b/pkgs/by-name/bu/butane/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "butane";
- version = "0.28.0";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${finalAttrs.version}";
- hash = "sha256-Cej00ugyOtjPys0E67z0oapwABdQxRuN4lOGu1qrtf8=";
+ hash = "sha256-lijMfxhUBopwbfEP4fEgszXh7zaRz7Xy1Y8PmatXXTE=";
};
vendorHash = null;
diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index aed35ada6c6e..00e182b435ed 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -1,6 +1,5 @@
{
lib,
- stdenv,
fetchCrate,
fetchurl,
rustPlatform,
@@ -8,28 +7,31 @@
openssl,
nix-update-script,
}:
+let
+ # That is from cargoDeps/risc0-circuit-recursion/build.rs
+ src-recursion-hash = "744b999f0a35b3c86753311c7efb2a0054be21727095cf105af6ee7d3f4d8849";
+ src-recursion = fetchurl {
+ name = "cargo-risczero-recursion-source";
+ url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip";
+ outputHash = src-recursion-hash; # This hash should be the same as src-recuresion-hash
+ outputHashAlgo = "sha256";
+ };
+in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-risczero";
- version = "1.1.2";
+ version = "3.0.5";
src = fetchCrate {
- inherit pname version;
- hash = "sha256-YZ3yhj1VLxl3Fg/yWhqrZXxIQ7oK6Gdo0NU39oDvoo8=";
- };
-
- src-recursion-hash = "28e4eeff7a8f73d27408d99a1e3e8842c79a5f4353e5117ec0b7ffaa7c193612"; # That is from cargoDeps/risc0-circuit-recursion/build.rs
-
- src-recursion = fetchurl {
- url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip";
- hash = "sha256-KOTu/3qPc9J0CNmaHj6IQseaX0NT5RF+wLf/qnwZNhI="; # This hash should be the same as src-recuresion-hash
+ inherit (finalAttrs) pname version;
+ hash = "sha256-1tuY+XoZpilak9gc5vDnRDEB1SK+itBWoGNxwefT6xo=";
};
env = {
RECURSION_SRC_PATH = src-recursion;
};
- cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY=";
+ cargoHash = "sha256-ayKQvhjYawPEl9ryVmDx4J93/EGPSeKds0mOnkRI2Fo=";
nativeBuildInputs = [
pkg-config
@@ -39,9 +41,6 @@ rustPlatform.buildRustPackage rec {
openssl
];
- # The tests require network access which is not available in sandboxed Nix builds.
- doCheck = false;
-
passthru.updateScript = nix-update-script { };
meta = {
@@ -51,4 +50,4 @@ rustPlatform.buildRustPackage rec {
license = with lib.licenses; [ asl20 ];
maintainers = [ ];
};
-}
+})
diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index f956c4608a6d..15e75b87da26 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -53,13 +53,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "cockpit";
- version = "363.1";
+ version = "364";
src = fetchFromGitHub {
owner = "cockpit-project";
repo = "cockpit";
tag = finalAttrs.version;
- hash = "sha256-w9+S3qc95gcNvVLGMdWlRxKXhNjZbcgKSGxlSvNJp9o=";
+ hash = "sha256-TAX0N6ZQWGr17GpyJS23Q5ES3USU2hxSiI867n6G17I=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/co/code2prompt/Cargo.lock b/pkgs/by-name/co/code2prompt/Cargo.lock
deleted file mode 100644
index 1136972201b9..000000000000
--- a/pkgs/by-name/co/code2prompt/Cargo.lock
+++ /dev/null
@@ -1,1699 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bstr"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-dependencies = [
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cc"
-version = "1.0.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
-dependencies = [
- "jobserver",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
-
-[[package]]
-name = "cli-clipboard"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d"
-dependencies = [
- "clipboard-win",
- "objc",
- "objc-foundation",
- "objc_id",
- "wl-clipboard-rs",
- "x11-clipboard",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
-dependencies = [
- "error-code",
- "str-buf",
- "winapi",
-]
-
-[[package]]
-name = "code2prompt"
-version = "1.0.0"
-dependencies = [
- "anyhow",
- "clap",
- "cli-clipboard",
- "colored",
- "git2",
- "handlebars",
- "ignore",
- "indicatif",
- "inquire",
- "jwalk",
- "regex",
- "serde_json",
- "termtree",
- "tiktoken-rs",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
-
-[[package]]
-name = "colored"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
-dependencies = [
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-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-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crossterm"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "derive-new"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "either"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "error-code"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
-
-[[package]]
-name = "fancy-regex"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05"
-dependencies = [
- "bit-set",
- "regex",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
-dependencies = [
- "thread_local",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "git2"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
-[[package]]
-name = "globset"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "handlebars"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "ignore"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "inquire"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
-dependencies = [
- "bitflags 2.5.0",
- "crossterm",
- "dyn-clone",
- "fuzzy-matcher",
- "fxhash",
- "newline-converter",
- "once_cell",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jwalk"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56"
-dependencies = [
- "crossbeam",
- "rayon",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.16.2+1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "newline-converter"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset",
-]
-
-[[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 = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "os_pipe"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pest"
-version = "2.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[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 = "redox_syscall"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
-dependencies = [
- "bitflags 2.5.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[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 = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "termtree"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-
-[[package]]
-name = "thiserror"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tiktoken-rs"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234"
-dependencies = [
- "anyhow",
- "base64",
- "bstr",
- "fancy-regex",
- "lazy_static",
- "parking_lot",
- "rustc-hash",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tree_magic_mini"
-version = "3.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
-dependencies = [
- "fnv",
- "home",
- "memchr",
- "nom",
- "once_cell",
- "petgraph",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "url"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[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 = "wayland-client"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
-dependencies = [
- "bitflags 1.3.2",
- "downcast-rs",
- "libc",
- "nix",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
-dependencies = [
- "nix",
- "once_cell",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
-dependencies = [
- "bitflags 1.3.2",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
-dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
-dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
-
-[[package]]
-name = "wl-clipboard-rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9"
-dependencies = [
- "derive-new",
- "libc",
- "log",
- "nix",
- "os_pipe",
- "tempfile",
- "thiserror",
- "tree_magic_mini",
- "wayland-client",
- "wayland-protocols",
-]
-
-[[package]]
-name = "x11-clipboard"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464"
-dependencies = [
- "x11rb",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
-dependencies = [
- "gethostname",
- "nix",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
-dependencies = [
- "nix",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix
index 66d9da853e45..a4f046ddc03a 100644
--- a/pkgs/by-name/co/code2prompt/package.nix
+++ b/pkgs/by-name/co/code2prompt/package.nix
@@ -4,31 +4,30 @@
rustPlatform,
pkg-config,
openssl,
+ perl,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "code2prompt";
- version = "1.1.0";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "mufeedvh";
repo = "code2prompt";
- rev = "v${finalAttrs.version}";
- hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-Gh8SsSTZW7QlyyC3SWJ5pOK2x85/GT7+LPJn2Jeczpc=";
};
- cargoLock = {
- lockFile = ./Cargo.lock;
- };
+ cargoHash = "sha256-t4HpGqojIkw9OBUAYz4ZEaB7XyHQxkFB2HtlkGKbe2s=";
- postPatch = ''
- # src is missing Cargo.lock
- ln -s ${./Cargo.lock} Cargo.lock
- '';
+ nativeBuildInputs = [
+ pkg-config
+ perl
+ ];
- nativeBuildInputs = [ pkg-config ];
-
- buildInputs = [ openssl ];
+ buildInputs = [
+ openssl
+ ];
meta = {
description = "CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting";
diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index 923b36d20808..30a3d4d1f5e6 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "coroot";
- version = "1.22.0";
+ version = "1.23.2";
src = fetchFromGitHub {
owner = "coroot";
repo = "coroot";
rev = "v${finalAttrs.version}";
- hash = "sha256-FntRLdYazY/FeZrOp+DEV3eaaVhn5hxlE4dkUGbemTc=";
+ hash = "sha256-aOTn7keIM5xTcYLOUW+8pmfpXyMSE/+Yq42Uitlr4OE=";
};
vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI=";
diff --git a/pkgs/by-name/da/daktari/package.nix b/pkgs/by-name/da/daktari/package.nix
index 6c2d4c810748..0a1b7f8574c9 100644
--- a/pkgs/by-name/da/daktari/package.nix
+++ b/pkgs/by-name/da/daktari/package.nix
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "daktari";
- version = "0.0.335";
+ version = "0.0.340";
pyproject = true;
__structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "genio-learn";
repo = "daktari";
tag = "v${finalAttrs.version}";
- hash = "sha256-yIhtP5k1qoy59qR10Pv6dqh7X8MACvQRsSAJR/6kEJ4=";
+ hash = "sha256-gHBpezrya7i4Gh3dQHynS5vJtBhvXndruGsRRBBRde8=";
};
patches = [ ./optional-pyclip.patch ];
diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index c06bc72fb5f1..e7ec6588744b 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "deck";
- version = "1.63.0";
+ version = "1.64.0";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${finalAttrs.version}";
- hash = "sha256-WmzjFMOOyx65EGnHdn9pWItFh1HVIp1DbNNwtQrPnPQ=";
+ hash = "sha256-nVV1nNOQ5zqywUXg3vdyiudryWVRKiDWU0Yc8b0albo=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
];
proxyVendor = true; # darwin/linux hash mismatch
- vendorHash = "sha256-YJ8Q/m+yL9x5CYnIOtYWNYcVUy4lHm/IYSm7kNZqqt4=";
+ vendorHash = "sha256-lo+1ijaWod0UB2PXzmg806q2KYrVu9yNgkI/Nq2lyq4=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix
index 35620afd9a81..46cb6facf837 100644
--- a/pkgs/by-name/de/dethrace/package.nix
+++ b/pkgs/by-name/de/dethrace/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dethrace";
- version = "0.9.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "dethrace-labs";
repo = "dethrace";
tag = "v${finalAttrs.version}";
- hash = "sha256-+C3NyRLmvXrkZuhLGwIIHFWjXLMpt3srLZCVrxRUlkA=";
+ hash = "sha256-SGQGErlmsJEhjdvZa2YPJWwNFuZR4RL81W7meilw8t0=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/do/docker-sbx/package.nix b/pkgs/by-name/do/docker-sbx/package.nix
new file mode 100644
index 000000000000..74cecebba681
--- /dev/null
+++ b/pkgs/by-name/do/docker-sbx/package.nix
@@ -0,0 +1,128 @@
+{
+ lib,
+ fetchurl,
+ stdenvNoCC,
+ installShellFiles,
+ autoPatchelfHook,
+ makeWrapper,
+ gccForLibs,
+ e2fsprogs,
+ lz4,
+ xxhash,
+ zlib,
+ zstd,
+ versionCheckHook,
+ nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "docker-sbx";
+ version = "0.34.0";
+ src =
+ if stdenvNoCC.hostPlatform.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-amd64.tar.gz";
+ hash = "sha256-5H9LOyKi0/SBVJ0ld6OkcP1h9r9eHrAb4fsVVVdMusg=";
+ }
+ else if stdenvNoCC.hostPlatform.system == "aarch64-linux" then
+ fetchurl {
+ url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-arm64.tar.gz";
+ hash = "sha256-dZ/ttnmaf62rA5Cs8YSmZGHVQoy9PQh3Ok/AnIjCqZ4=";
+ }
+ else if stdenvNoCC.hostPlatform.system == "aarch64-darwin" then
+ fetchurl {
+ url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-darwin.tar.gz";
+ hash = "sha256-aBh6NbtQ5o2zxuR+d1U1gZpm2bch/J3Y8GZ73DeUBUk=";
+ }
+ else
+ throw "Unsupported host platform ${stdenvNoCC.hostPlatform.system}";
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null;
+
+ nativeBuildInputs = [
+ installShellFiles
+ versionCheckHook
+ ]
+ ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
+ autoPatchelfHook
+ makeWrapper
+ e2fsprogs
+ ];
+
+ buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
+ lz4
+ zlib
+ zstd
+ xxhash
+ gccForLibs
+ ];
+
+ dontBuild = true;
+ doInstallCheck = true;
+ versionCheckProgramArg = "version";
+ versionCheckKeepEnvironment = [ "HOME" ];
+ preVersionCheck = ''
+ export HOME=$TMPDIR
+ '';
+
+ installPhase =
+ if stdenvNoCC.hostPlatform.isLinux then
+ ''
+ runHook preInstall
+
+ PREFIX=$out bash ./install.sh
+
+ wrapProgram $out/bin/sbx \
+ --prefix PATH : ${lib.makeBinPath [ e2fsprogs ]}
+
+ ${lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+ export HOME=$TMPDIR
+ $out/bin/sbx completion bash > sbx.bash
+ $out/bin/sbx completion fish > sbx.fish
+ $out/bin/sbx completion zsh > sbx.zsh
+ installShellCompletion sbx.{bash,fish,zsh}
+ ''}
+
+ runHook postInstall
+ ''
+ else
+ ''
+ runHook preInstall
+
+ mkdir -pv $out
+ cp -rv bin libexec $out
+
+ installShellCompletion \
+ --bash --name sbx.bash completions/bash/sbx \
+ --zsh --name _sbx completions/zsh/_sbx \
+ --fish --name sbx.fish completions/fish/sbx.fish
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Safe environments for agents";
+ longDescription = ''
+ Docker Sandboxes provides sandboxes with controlled access to your
+ filesystem, network, and tools. This means your agents can work
+ autonomously without putting your machine or data at risk.
+ '';
+ homepage = "https://docs.docker.com/reference/cli/sbx/";
+ changelog = "https://github.com/docker/sbx-releases/releases/tag/v${finalAttrs.version}";
+ mainProgram = "sbx";
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ "aarch64-darwin"
+ ];
+ license = lib.licenses.unfree;
+ maintainers = [
+ lib.maintainers.skyesoss
+ lib.maintainers.erics118
+ ];
+ };
+})
diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 22ed742e22d5..335241bfcf75 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -10,20 +10,20 @@
let
pname = "electron-mail";
- version = "5.3.7";
+ version = "5.3.8";
sources = {
x86_64-linux = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
- hash = "sha256-VJbCQ/4yIuBE4NPDFUbp8t2G/QjUclphH/MghvamDVo=";
+ hash = "sha256-twqB1D3zLlZJuxQWD4dGF70w57yYv6i3abGBidERsss=";
};
aarch64-darwin = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
- hash = "sha256-ulB+dlp6ZBhcBJiLY4k+E/oEWy9XSIuIzd5rTzEq9+4=";
+ hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
- hash = "sha256-LbAqUj34m8qSq8sQ1xgCQj9+MfJHoFDRMq+/waMKtzM=";
+ hash = "sha256-I1UvFMSdAwkqgkhn+mkBGslA8v+VTajO/Za0lJ5uYZ8=";
};
};
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 60df13ea76ef..79d889e24f39 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
- version = "0.0.271";
+ version = "0.0.277";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
- hash = "sha256-R3hdy6VSTHBe2ei4aysJhrc++ptQioVe88p/c2CuUP4=";
+ hash = "sha256-GAICiChPRRFBsZsQtCpPBzNvjWpx5YSAlwYL0/fEe5A=";
};
postPatch = ''
diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix
index cf5cdef3bbc1..72b5cb81d249 100644
--- a/pkgs/by-name/fo/forgejo-mcp/package.nix
+++ b/pkgs/by-name/fo/forgejo-mcp/package.nix
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "forgejo-mcp";
- version = "2.30.0";
+ version = "2.30.1";
src = fetchFromCodeberg {
owner = "goern";
repo = "forgejo-mcp";
tag = "v${finalAttrs.version}";
- hash = "sha256-DV8lL6Q/0gD8mFn3q5UusHv8ahNtmk9t9vtbhpvpxBs=";
+ hash = "sha256-Xi75PFZuNKDfxFhnwYsArD9GphrRLxJlFZgzocMR4C4=";
};
vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik=";
diff --git a/pkgs/by-name/fr/frotz/package.nix b/pkgs/by-name/fr/frotz/package.nix
index 845cc7f48790..f78b72dc3ade 100644
--- a/pkgs/by-name/fr/frotz/package.nix
+++ b/pkgs/by-name/fr/frotz/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://davidgriffith.gitlab.io/frotz/";
- changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
+ changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/ChangeLog";
description = "Z-machine interpreter for Infocom games and other interactive fiction (${frontend})";
mainProgram = progName;
platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 5ee10e29eb8f..11b14a9bcb6d 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -12,13 +12,13 @@
buildNpmPackage (finalAttrs: {
pname = "ghostfolio";
- version = "3.13.0";
+ version = "3.18.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = finalAttrs.version;
- hash = "sha256-tPVGMAP45x/4NTL8px9jEbW6hQyhiOYiZp0tuDdfYL8=";
+ hash = "sha256-BSH7NQV2iTmfGE6dHQEeObQQ5CkKZxsgHAbrjElHHHE=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
'';
};
- npmDepsHash = "sha256-0/tHzfJrotlCxhiiVC6yddlj62Ef6IAeaZf/xufFiWU=";
+ npmDepsHash = "sha256-0Si+3zHyGoMbgEpNWdZVp+obNE0oqM8ghYDZvloJU5g=";
postPatch = ''
substituteInPlace replace.build.mjs \
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index b78302dcb6d7..a1a7e0824265 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
- pnpm_10_29_2,
+ pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
@@ -14,7 +14,7 @@
nix-update-script,
}:
let
- pnpm = pnpm_10_29_2;
+ pnpm = pnpm_10;
in
stdenv.mkDerivation (finalAttrs: {
pname = "gitify";
diff --git a/pkgs/by-name/gi/gitlab-ci-validate/package.nix b/pkgs/by-name/gi/gitlab-ci-validate/package.nix
new file mode 100644
index 000000000000..7d428ed66608
--- /dev/null
+++ b/pkgs/by-name/gi/gitlab-ci-validate/package.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+ pname = "gitlab-ci-validate";
+ version = "0.6.0";
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "Code0x58";
+ repo = "gitlab-ci-validate";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-j32knPhVio2OTATkW1Z3SMMYwl9u6Lh00Rell/knQ/0=";
+ };
+
+ vendorHash = "sha256-/+iu9SIaLtE51xcEzgA8dCp0eTAoPskp4xGlm1bsXTs=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X=main.version=${finalAttrs.version}"
+ ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Command line tool to validate .gitlab-ci.yml files";
+ homepage = "https://github.com/Code0x58/gitlab-ci-validate";
+ changelog = "https://github.com/Code0x58/gitlab-ci-validate/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ drupol ];
+ mainProgram = "gitlab-ci-validate";
+ };
+})
diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix
index 0f77e32c9f3e..48c1142764cc 100644
--- a/pkgs/by-name/go/govc/package.nix
+++ b/pkgs/by-name/go/govc/package.nix
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "govc";
- version = "0.53.1";
+ version = "0.55.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
tag = "v${finalAttrs.version}";
- hash = "sha256-egyXzA+0xobHcq3dGOYou4sPCHRDv2l8QWo8ZLWofKU=";
+ hash = "sha256-wz0+x0abPEScOYdwm94YW7KxGX6SANh0nf2TpgcyHmk=";
};
- vendorHash = "sha256-xRhjAOQKX6CU9BmdNZonDMwmnEvFXWOaP73j7wPIexk=";
+ vendorHash = "sha256-pPni473N8W3hrAITQ2hhIfcRiKZu1XvDzJH9rOrSxt8=";
sourceRoot = "${finalAttrs.src.name}/govc";
diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix
index e7a388c33bf9..4d4fad7ffbc7 100644
--- a/pkgs/by-name/gr/grimblast/package.nix
+++ b/pkgs/by-name/gr/grimblast/package.nix
@@ -20,13 +20,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "grimblast";
- version = "0.1-unstable-2026-05-29";
+ version = "0.1-unstable-2026-06-30";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "contrib";
- rev = "bf1a7cdb086587e6bed6e8ecd285a81c01a11c54";
- hash = "sha256-epTJKmTCNL1Hm6/YdEWAgiOMVBSzC9/v/rjyOieP3yA=";
+ rev = "3dcbce715ae8b93107fa8632db15bf976862a573";
+ hash = "sha256-JP0D8r8o9+jnYk0/B5O722La+oZeC5iNQ3lonKFTmbQ=";
};
strictDeps = true;
diff --git a/pkgs/by-name/in/interval-tree/package.nix b/pkgs/by-name/in/interval-tree/package.nix
new file mode 100644
index 000000000000..71ce2ea68ead
--- /dev/null
+++ b/pkgs/by-name/in/interval-tree/package.nix
@@ -0,0 +1,43 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "interval-tree";
+ version = "3.1.1";
+
+ src = fetchFromGitHub {
+ owner = "5cript";
+ repo = "interval-tree";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-bSZ56EzzNy6gHgs8OptT/iBlf56RJz+09BE4WGGJpog=";
+ };
+
+ # interval-tree is a header only library
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/
+ cp -r $src/include/ $out/
+
+ runHook postInstall
+ '';
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "C++ header only interval tree implementation";
+ maintainers = with lib.maintainers; [ aiyion ];
+ homepage = "https://github.com/5cript/interval-tree";
+ license = lib.licenses.cc0;
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix
index 8fd0def5db54..c9a14712a105 100644
--- a/pkgs/by-name/it/itch/package.nix
+++ b/pkgs/by-name/it/itch/package.nix
@@ -12,7 +12,7 @@
}:
let
- version = "26.9.0";
+ version = "26.13.0";
itch-setup = fetchzip {
url = "https://broth.itch.zone/itch-setup/linux-amd64/1.29.0/archive.zip";
@@ -26,7 +26,7 @@ let
owner = "itchio";
repo = "itch";
rev = "v${version}";
- hash = "sha256-zTUCHpyjfPiYDAatkavNlSHekBTHadiHUa3VyLChYKE=";
+ hash = "sha256-v/2y9F+uigGaVsEy4gaa7WGTByW1wqYosti6AEOsaQQ=";
sparseCheckout = [ sparseCheckout ];
}
+ sparseCheckout;
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchzip {
url = "https://github.com/itchio/itch/releases/download/v${finalAttrs.version}/itch-v${finalAttrs.version}-linux-amd64.tar.gz";
stripRoot = false;
- hash = "sha256-SRgaVweNqf/13C948eWncuCn9Cj82hYxDF3AzCaL5E0=";
+ hash = "sha256-//QA4aW9uwZ/yhKf1xJRthj36YqfXuu/6yU1yGXQeFo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ja/jack-passthrough/package.nix b/pkgs/by-name/ja/jack-passthrough/package.nix
index 4725c4c63e2f..22c88835c545 100644
--- a/pkgs/by-name/ja/jack-passthrough/package.nix
+++ b/pkgs/by-name/ja/jack-passthrough/package.nix
@@ -7,11 +7,12 @@
meson,
ninja,
fmt_9,
+ nix-update-script,
}:
stdenv.mkDerivation {
pname = "jack-passthrough";
- version = "2021-9-25";
+ version = "0-unstable-2021-9-25";
# https://github.com/guysherman/jack-passthrough
src = fetchFromGitHub {
@@ -26,11 +27,14 @@ stdenv.mkDerivation {
meson
ninja
];
+
buildInputs = [
fmt_9
libjack2
];
+ passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
meta = {
description = "Simple app to help with JACK apps that behave strangely";
longDescription = ''
@@ -42,7 +46,10 @@ stdenv.mkDerivation {
homepage = "https://github.com/guysherman/jack-passthrough";
# license unknown: https://github.com/guysherman/jack-passthrough/issues/2
license = lib.licenses.unfree;
- maintainers = [ lib.maintainers.PowerUser64 ];
+ maintainers = with lib.maintainers; [
+ PowerUser64
+ l1npengtul
+ ];
platforms = [ "x86_64-linux" ];
mainProgram = "jack-passthru";
};
diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix
index 78fb01480bab..d94c61242a64 100644
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -12,13 +12,13 @@
buildDotnetModule (finalAttrs: {
pname = "jackett";
- version = "0.24.2108";
+ version = "0.24.2151";
src = fetchFromGitHub {
owner = "jackett";
repo = "jackett";
tag = "v${finalAttrs.version}";
- hash = "sha256-MWA5gTiNjkKIaHgUGVt2XV3QBPYGTf/dVqCnmdAaJ0U=";
+ hash = "sha256-V4oBku723EWLTBBjFVkAJTBdhXYTs3Vx98YDinTr5Kc=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix
index 2c65e602a957..19bf5849239f 100644
--- a/pkgs/by-name/ke/keto/package.nix
+++ b/pkgs/by-name/ke/keto/package.nix
@@ -1,48 +1,84 @@
{
+ lib,
+ stdenv,
fetchFromGitHub,
buildGoModule,
- lib,
+ versionCheckHook,
+ installShellFiles,
}:
-let
+buildGoModule (finalAttrs: {
pname = "keto";
version = "26.2.0";
- commit = "e4393662cd2e744deeb79de77669e07b6ccf51f3";
-in
-buildGoModule {
- inherit pname version commit;
src = fetchFromGitHub {
owner = "ory";
repo = "keto";
- rev = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-wRtz4RvJ7LxVnSLmXVZFGa9QXjcPnDNJxHKosbyTed0=";
};
vendorHash = "sha256-B27aC4yXS36eOoq53+RWp0vq1Oqw2aR+gOjv0m+b/I4=";
+ __structuredAttrs = true;
+
tags = [
"sqlite"
"json1"
"hsm"
];
- subPackages = [ "." ];
+ subPackages = [ "..." ];
# Pass versioning information via ldflags
ldflags = [
"-s"
- "-w"
- "-X github.com/ory/keto/internal/driver/config.Version=${version}"
- "-X github.com/ory/keto/internal/driver/config.Commit=${commit}"
+ "-X github.com/ory/keto/internal/driver/config.Version=${finalAttrs.src.tag}"
+ "-X github.com/ory/keto/internal/driver/config.Commit=${finalAttrs.src.rev}"
];
+ nativeBuildInputs = [ installShellFiles ];
+ # tests use dynamic port assignment via port `0`
+ __darwinAllowLocalNetworking = true;
+
+ preCheck = ''
+ export version='${finalAttrs.src.tag}'
+ '';
+ checkFlags = [
+ "-short"
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgramArg = [ "version" ];
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd keto \
+ --bash <($out/bin/keto completion bash) \
+ --fish <($out/bin/keto completion fish) \
+ --zsh <($out/bin/keto completion zsh)
+ '';
+
meta = {
- description = "ORY Keto, the open source access control server";
- homepage = "https://www.ory.sh/keto/";
+ description = "Scalable and customizable permission server ";
+ longDescription = ''
+ Open source implementation of "Zanzibar: Google's Consistent, Global Authorization System". It follows
+ [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy)
+ and focuses on:
+
+ - Scalable permission checks based on the Zanzibar model
+ - The Ory Permission Language for defining access control policies
+ - Relationship-based access control (ReBAC)
+ - Low latency permission checks (sub-10ms)
+ - Horizontal scaling to billions of relationships
+ - Consistency and high availability
+ '';
+ homepage = "https://github.com/ory/keto";
+ changelog = "https://github.com/ory/keto/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
mrmebelman
debtquity
];
+ mainProgram = "keto";
};
-}
+})
diff --git a/pkgs/by-name/ke/keylights/package.nix b/pkgs/by-name/ke/keylights/package.nix
new file mode 100644
index 000000000000..096a4559aa2a
--- /dev/null
+++ b/pkgs/by-name/ke/keylights/package.nix
@@ -0,0 +1,57 @@
+{
+ lib,
+ fetchFromCodeberg,
+ installShellFiles,
+ rustPlatform,
+ stdenv,
+ testers,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "keylights";
+ version = "0.1.0";
+
+ __structuredAttrs = true;
+
+ src = fetchFromCodeberg {
+ owner = "wjohnsto";
+ repo = "keylights";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-cl/IRkQMowrWOt0yLEFZC1J2MM6Fr68J6YaakUXwxTQ=";
+ };
+
+ cargoHash = "sha256-ns+EppqGP19P+xzevgZcovPKwYkMkWTcu5L0bovuQuk=";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ keylightsBin="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/keylights"
+
+ "$keylightsBin" completions bash > keylights.bash
+ "$keylightsBin" completions fish > keylights.fish
+ "$keylightsBin" completions zsh > _keylights
+
+ installShellCompletion --cmd keylights \
+ --bash keylights.bash \
+ --fish keylights.fish \
+ --zsh _keylights
+ '';
+
+ passthru.tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "keylights --version";
+ };
+
+ meta = {
+ description = "Daemonless CLI for discovering and controlling Elgato Key Light devices";
+ homepage = "https://codeberg.org/wjohnsto/keylights";
+ changelog = "https://codeberg.org/wjohnsto/keylights/releases/tag/v${finalAttrs.version}";
+ license = with lib.licenses; [
+ mit
+ asl20
+ ];
+ maintainers = with lib.maintainers; [ wjohnsto ];
+ mainProgram = "keylights";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/ko/kotofetch/package.nix b/pkgs/by-name/ko/kotofetch/package.nix
new file mode 100644
index 000000000000..e8a25ccea7b0
--- /dev/null
+++ b/pkgs/by-name/ko/kotofetch/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "kotofetch";
+ version = "0.2.22";
+
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "hxpe-dev";
+ repo = "kotofetch";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-aY8HRKSHLQKjl4b7v5q3SeNMc+GJPnE2XVrEsl+nGR0=";
+ };
+
+ cargoHash = "sha256-r36x/I/RaIWFEoDYXf3edpLeqGvEyozhT4EuCTSEe/k=";
+
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
+ meta = {
+ description = "Minimalist fetch tool for Japanese quotes";
+ mainProgram = "kotofetch";
+ homepage = "https://github.com/hxpe-dev/kotofetch";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ yarn ];
+ };
+})
diff --git a/pkgs/by-name/ld/ldash/package.nix b/pkgs/by-name/ld/ldash/package.nix
new file mode 100644
index 000000000000..4e7a78529154
--- /dev/null
+++ b/pkgs/by-name/ld/ldash/package.nix
@@ -0,0 +1,32 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitea,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "ldash";
+ version = "1.3.1";
+ __structuredAttrs = true;
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "md-weber";
+ repo = "ldash";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-ji1sgzDjJ8KVUVaKzhhCFBgIAAzRS2NQ7DTvJxb3PKA=";
+ };
+
+ cargoHash = "sha256-9/Dk3FQuSlUWPm4z3VadJl5FYtZ1gFY9mdZwiSXzzvc=";
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "This is a TUI for hledger to show a nice dashboard";
+ homepage = "https://codeberg.org/md-weber/ldash";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ matthewcroughan ];
+ mainProgram = "ldash";
+ };
+})
diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index 7995f6b699ea..9c6e1baf5b1f 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "152.0.2-1",
+ "packageVersion": "152.0.4-1",
"source": {
- "rev": "152.0.2-1",
- "hash": "sha256-CgH0HOtNbdoHMZ/MJL/zPK0Gn+e+qqtZjqPDSq63gX8="
+ "rev": "152.0.4-1",
+ "hash": "sha256-sbL3lZyYaewS84Yhb9HOHgV3xPvzbu+IcjdAW1hdlAY="
},
"firefox": {
- "version": "152.0.2",
- "hash": "sha512-5OVM///P1XUerFgXp7dLDvCqQ/wA7yk5fMnfmqUlcrInK5bmA3OnDXEr5NyEkXDY1cG0SfPql4tKso3uGQVrAw=="
+ "version": "152.0.4",
+ "hash": "sha512-DFZiq6j7iXkCr5Xbsv2YixltnPmui5h66J4KZJKsdTuNS4u3sydJCcLrIAqwmN81biPNYIRVZGf1XmkScxfzmg=="
}
}
diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 3425e2bbdfc1..7a553d786a10 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook-desktop";
- version = "26.6.16";
+ version = "26.6.22";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
- hash = "sha256-HtmuFN7iNNwuQ0CXzqnEJN4PNh0D7weHniegtF4EuqQ=";
+ hash = "sha256-OgNscshw445uf2PtiYVlyCfx/l2BNZyZK5QwQSunCQ0=";
};
- cargoHash = "sha256-PUfXwtxuaheoyZA2fAyoc9CyD/oBAjkUsVrP6U7qvA0=";
+ cargoHash = "sha256-USdDHcWexjAllH/kOZVc4XMehESoIozkvvOw47ZeBD8=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix
index 16f2556b2a10..af26fb66b206 100644
--- a/pkgs/by-name/lu/lumen/package.nix
+++ b/pkgs/by-name/lu/lumen/package.nix
@@ -2,8 +2,11 @@
lib,
rustPlatform,
fetchFromGitHub,
+ makeWrapper,
pkg-config,
openssl,
+ fzf,
+ mdcat,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -26,10 +29,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
# use the non-vendored openssl
env.OPENSSL_NO_VENDOR = 1;
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [
+ makeWrapper
+ pkg-config
+ ];
buildInputs = [ openssl ];
+ postFixup = ''
+ wrapProgram $out/bin/lumen --prefix PATH : ${
+ lib.makeBinPath [
+ fzf
+ mdcat
+ ]
+ }
+ '';
+
# tests that require a git repository to run
checkFlags = [
"--skip=vcs::git::tests::test_get_merge_base_returns_ancestor"
diff --git a/pkgs/by-name/ly/lyricspot/package.nix b/pkgs/by-name/ly/lyricspot/package.nix
new file mode 100644
index 000000000000..6a7eaef1388e
--- /dev/null
+++ b/pkgs/by-name/ly/lyricspot/package.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ fetchFromGitHub,
+ stdenvNoCC,
+ makeWrapper,
+ python3,
+ playerctl,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "lyricspot";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "vlensys";
+ repo = "lyricspot";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-qDXTcTlpMWW7vAQuOFBEnM26DvIdy/fvkGTL/TdDa2A=";
+ };
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp lyricspot.py $out/bin/lyricspot
+ chmod +x $out/bin/lyricspot
+ wrapProgram $out/bin/lyricspot \
+ --prefix PATH ":" ${
+ lib.makeBinPath [
+ python3
+ playerctl
+ ]
+ }
+ '';
+
+ meta = {
+ homepage = "https://github.com/vlensys/lyricspot";
+ description = "Good old live synced lyrics in your terminal";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "lyricspot";
+ maintainers = with lib.maintainers; [
+ yarn
+ ];
+ platforms = lib.platforms.unix;
+ };
+})
diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix
index 68cfd3f26480..797be48a03bf 100644
--- a/pkgs/by-name/mc/mcporter/package.nix
+++ b/pkgs/by-name/mc/mcporter/package.nix
@@ -15,20 +15,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mcporter";
- version = "0.11.3";
+ version = "0.12.3";
src = fetchFromGitHub {
owner = "steipete";
repo = "mcporter";
tag = "v${finalAttrs.version}";
- hash = "sha256-xBH0OMrAQ3eVqBczzJnbaxbBLo2mRc6cCZBb5w4SkhI=";
+ hash = "sha256-dfbNyvIbdhZOLuwRDNLqUJHVeMEemioanktD6nL0Pmk=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
- hash = "sha256-Ga1M3SQBaQnODQXh4+AXQ0FVCr7e8wPpbaV1ffQYNLM=";
+ hash = "sha256-EGG9ycEMssFE4MOiXL5YuCRiXEaP//3boceR3d7/VQo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 886ee73438fe..34ab0e9b72ab 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -7,7 +7,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdns-scanner";
- version = "0.27.2";
+ version = "0.27.3";
__structuredAttrs = true;
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "CramBL";
repo = "mdns-scanner";
tag = "v${finalAttrs.version}";
- hash = "sha256-oqU7lpDD2umCBAcPYKjo+5kdsCu3gjBiP5MPNvH2fhs=";
+ hash = "sha256-daJEiYOF1N2m4zVbsBuRl8KGrDs62GGDP9lCok9r/3w=";
};
- cargoHash = "sha256-TqTN9qXnfvP067kh+bfdXlU1lKaZistIvq1qJsgmJ8o=";
+ cargoHash = "sha256-eCB5nVEucMFX/wz9zrAKO9d3yI7BK/URpjlU39Y4g4I=";
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/me/mendingwall/package.nix b/pkgs/by-name/me/mendingwall/package.nix
new file mode 100644
index 000000000000..029face5d87e
--- /dev/null
+++ b/pkgs/by-name/me/mendingwall/package.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ wrapGAppsHook4,
+ meson,
+ blueprint-compiler,
+ glib,
+ gtk4,
+ libadwaita,
+ gettext,
+ appstream,
+ desktop-file-utils,
+ pkg-config,
+ ninja,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "mendingwall";
+ version = "0.3.8";
+
+ src = fetchFromGitHub {
+ owner = "lawmurray";
+ repo = "mendingwall";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-bt2DvbtwUaad5j2XpySA4KBfI4953tc1bHRuUUkS84M=";
+ };
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ nativeBuildInputs = [
+ meson
+ blueprint-compiler
+ gettext
+ appstream
+ desktop-file-utils
+ pkg-config
+ ninja
+ wrapGAppsHook4
+ ];
+
+ buildInputs = [
+ glib
+ gtk4
+ libadwaita
+ ];
+
+ meta = with lib; {
+ description = "Fix theme and menu inconsistencies when using multiple desktop environments";
+ homepage = "https://mendingwall.indii.org/";
+ changelog = "https://github.com/lawmurray/mendingwall/releases/tag/v${finalAttrs.version}";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.jromer ];
+ platforms = platforms.linux;
+ mainProgram = "mendingwall";
+ };
+})
diff --git a/pkgs/by-name/mi/microcad/package.nix b/pkgs/by-name/mi/microcad/package.nix
new file mode 100644
index 000000000000..b731861af064
--- /dev/null
+++ b/pkgs/by-name/mi/microcad/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ fetchFromCodeberg,
+ rustPlatform,
+ pkg-config,
+ wayland,
+ cmake,
+ ninja,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "microcad";
+ version = "0.5.0";
+ __structuredAttrs = true;
+
+ src = fetchFromCodeberg {
+ owner = "microcad";
+ repo = "microcad";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-2164ynL01cLv5/D1FkcZpuBXTHPMjbpeaPPEZpmrSso=";
+ };
+
+ cargoHash = "sha256-OwPAl8LirPQEQ8ytx/+9OnrdbUagLA25mGMw1z/L6V0=";
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ pkg-config
+ ];
+ buildInputs = [ wayland ];
+ cargoBuildFlags = [
+ "-p"
+ "microcad-viewer"
+ "-p"
+ "microcad"
+ "-p"
+ "microcad-lsp"
+ ];
+
+ dontUseCmakeConfigure = true;
+ dontUseNinjaBuild = true;
+ dontUseNinjaInstall = true;
+ dontUseNinjaCheck = true;
+
+ meta = {
+ description = "Description language for modeling parameterizable geometric objects";
+ homepage = "https://microcad.xyz";
+ license = lib.licenses.agpl3Plus;
+ mainProgram = "microcad";
+ donationPage = "https://opencollective.com/microcad/donate";
+ platforms = [ "x86_64-linux" ];
+ maintainers = with lib.maintainers; [ fred441a ];
+ };
+})
diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix
index 59e6c8e5f6a0..2cefcc613deb 100644
--- a/pkgs/by-name/mu/multica-cli/package.nix
+++ b/pkgs/by-name/mu/multica-cli/package.nix
@@ -9,18 +9,18 @@ buildGoModule rec {
__structuredAttrs = true;
pname = "multica-cli";
- version = "0.3.27";
+ version = "0.3.34";
src = fetchFromGitHub {
owner = "multica-ai";
repo = "multica";
rev = "v${version}";
- hash = "sha256-zHjyITvFG7dTk8mFQ62f8JY9wLbKeOvlo0pjF6hQxcI=";
+ hash = "sha256-8SZ9NIWpyZirUYM5zvQv7bA82XhxgZanzw0oeyAkntg=";
};
sourceRoot = "${src.name}/server";
- vendorHash = "sha256-NXdBykPMWDD4BGLo2ams+KC14mxGNJYoV/dqobH6dv8=";
+ vendorHash = "sha256-4OHW+OEIzi65iZ+XZqhBcs9ZNR13Js0dHDHZTbEG6nc=";
subPackages = [ "cmd/multica" ];
diff --git a/pkgs/by-name/oa/oathkeeper/package.nix b/pkgs/by-name/oa/oathkeeper/package.nix
index ef923bc2f4ca..16b04e5b4bc3 100644
--- a/pkgs/by-name/oa/oathkeeper/package.nix
+++ b/pkgs/by-name/oa/oathkeeper/package.nix
@@ -1,44 +1,89 @@
{
+ lib,
+ stdenv,
fetchFromGitHub,
buildGoModule,
- lib,
+ installShellFiles,
+ versionCheckHook,
}:
-let
+buildGoModule (finalAttrs: {
pname = "oathkeeper";
version = "26.2.0";
- commit = "c84dbe07ecbf6f10154f04ec49b137a115155289";
-in
-buildGoModule {
- inherit pname version commit;
src = fetchFromGitHub {
owner = "ory";
repo = "oathkeeper";
- rev = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-Dux9g5AWnbj9kXoIogVneOYywgg9TnyXqP41YT/1C8k=";
};
vendorHash = "sha256-/Qgdes8EAxP9FDKbahQdCpAD7PSe4iCkUvL1+poqaWc=";
+ __structuredAttrs = true;
tags = [
"sqlite"
"json1"
"hsm"
];
- subPackages = [ "." ];
+ subPackages = [ "..." ];
# Pass versioning information via ldflags
ldflags = [
"-s"
- "-w"
- "-X github.com/ory/oathkeeper/x.Version=${version}"
- "-X github.com/ory/oathkeeper/x.Commit=${commit}"
+ "-X github.com/ory/oathkeeper/x.Version=${finalAttrs.src.tag}"
+ "-X github.com/ory/oathkeeper/x.Commit=${finalAttrs.src.rev}"
];
+ nativeBuildInputs = [ installShellFiles ];
+ # upstream tests use dynamic port assignment
+ __darwinAllowLocalNetworking = true;
+
+ # The configuration contains values or keys which are invalid:
+ # version:
+ # ^-- does not match pattern "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
+ preCheck = ''
+ export version="${finalAttrs.src.tag}"
+ '';
+ checkFlags =
+ let
+ skippedTests = [
+ # flaky test, if system under high load the underlying server may be unavailable
+ "TestAuthenticatorOAuth2Introspection"
+ # flaky test(s): likely due to race condition within parallel test run, revisit at later date
+ # Error: Expected nil, but got: &oauth2.Token{AccessToken:"some-token", TokenType:"Bearer", RefreshToken:"", Expiry:time.Date(2026, time.June, 24, 22, 41, 47, 887223251, time.UTC), ExpiresIn:0, raw:interface {}(nil), expiryDelta:0}
+ "TestClientCredentialsCache"
+ # Error: Not equal:
+ # expected: rule.Rule{ID:"foo2", Version:"", Description:"Get users rule", Match:(*rule.Match)(0x64e4fd34c30), Authenticators>
+ # actual : rule.Rule{ID:"foo2", Version:"v26.2.0", Description:"Get users rule", Match:(*rule.Match)(0x64e4ff56ed0), Authent>
+ "TestHandler"
+ ];
+ in
+ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgramArg = [ "version" ];
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd oathkeeper \
+ --bash <($out/bin/oathkeeper completion bash) \
+ --fish <($out/bin/oathkeeper completion fish) \
+ --zsh <($out/bin/oathkeeper completion zsh)
+ '';
meta = {
- description = "Open-source identity and access proxy that authorizes HTTP requests based on sets of rules";
- homepage = "https://www.ory.sh/oathkeeper/";
+ description = "Identity and access proxy that authorizes HTTP requests based on sets of rules";
+ longDescription = ''
+ It follows
+ [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy) and focuses on:
+
+ - Authenticating and authorizing HTTP requests
+ - Acting as a reverse proxy or decision API
+ - Mutating requests with identity information
+ - Integrating with existing API gateways and proxies
+ - Supporting multiple authentication and authorization strategies
+ - Working in Zero-Trust network architectures
+ '';
+ homepage = "https://github.com/ory/oathkeeper";
+ changelog = "https://github.com/ory/oathkeeper/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
camcalaquian
@@ -46,4 +91,4 @@ buildGoModule {
];
mainProgram = "oathkeeper";
};
-}
+})
diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 7e6f2035d5a8..21a043873d5c 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "oelint-adv";
- version = "9.9.0";
+ version = "9.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-adv";
tag = finalAttrs.version;
- hash = "sha256-c25opp+T1E3LiB6YUb393ar+pLiswpwTuR9fJezewTY=";
+ hash = "sha256-656OiHkRVP2M9/gR8faR2mEw9EzjHy92JRk82bD+I4k=";
};
postPatch = ''
diff --git a/pkgs/by-name/or/ory-hydra/package.nix b/pkgs/by-name/or/ory-hydra/package.nix
index 14ab16c90129..237ec0a80b80 100644
--- a/pkgs/by-name/or/ory-hydra/package.nix
+++ b/pkgs/by-name/or/ory-hydra/package.nix
@@ -1,8 +1,10 @@
{
lib,
+ stdenv,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
+ installShellFiles,
}:
buildGoModule (finalAttrs: {
pname = "hydra";
@@ -17,6 +19,7 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-KVCoDATyt5Qp0r3vGwdXqkjh0FEdNyKi6mXk99D6HD8=";
+ __structuredAttrs = true;
# `json1` not needed (see: https://github.com/ory/hydra/commit/93edc9ad894771c67f46ae2c57ee7e50382d73cd)
# `sqlite_omit_load_extension` consistency with upstream (see: https://github.com/ory/hydra/blob/master/.docker/Dockerfile-local-build#L20C58-L20C84). Will disable sqlite runtime extension loading (see: https://sqlite.org/loadext.html)
tags = [
@@ -25,22 +28,49 @@ buildGoModule (finalAttrs: {
"sqlite_omit_load_extension"
];
- subPackages = [ "." ];
+ subPackages = [ "..." ];
ldflags = [
"-s"
- "-X github.com/ory/hydra/v2/driver/config.Version=v${finalAttrs.version}"
+ "-X github.com/ory/hydra/v2/driver/config.Version=${finalAttrs.src.tag}"
"-X github.com/ory/hydra/v2/driver/config.Commit=${finalAttrs.src.rev}"
];
+ nativeBuildInputs = [ installShellFiles ];
+ # tests use dynamic port assignment via port `0`
+ __darwinAllowLocalNetworking = true;
+ preCheck = ''
+ export version="${finalAttrs.src.tag}"
+ '';
+ checkFlags = [
+ "-short"
+ ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "version" ];
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd hydra \
+ --bash <($out/bin/hydra completion bash) \
+ --fish <($out/bin/hydra completion fish) \
+ --zsh <($out/bin/hydra completion zsh)
+ '';
+
meta = {
description = "OpenID Certified™ OAuth 2.0 Server and OpenID Connect Provider";
- homepage = "https://www.ory.com/hydra";
- changelog = "https://github.com/ory/hydra/releases/tag/v${finalAttrs.version}";
+ longDescription = ''
+ Server implementation of the OAuth 2.0 authorization framework and the OpenID Connect Core 1.0. It follows
+ [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy) and focuses on:
+
+ - OAuth 2.0 and OpenID Connect flows
+ - Token issuance and validation
+ - Client management
+ - Consent and login flow orchestration
+ - JWKS management
+ - Low latency and high throughput
+ '';
+ homepage = "https://github.com/ory/hydra";
+ changelog = "https://github.com/ory/hydra/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
debtquity
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index f5111b93be6c..50a095b9c449 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "otel-desktop-viewer";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "CtrlSpice";
repo = "otel-desktop-viewer";
rev = "v${finalAttrs.version}";
- hash = "sha256-oHnawHizBsyGSMORZz8qVQ6PZ/Ta/ftX+m799J1GhWM=";
+ hash = "sha256-9m1W2DxbMyBOGeECTn78X7I3GcToW5Gi33HWXGyWFO8=";
};
# NOTE: This project uses Go workspaces, but 'buildGoModule' does not support
diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix
index d1748c3592f1..902c753439a0 100644
--- a/pkgs/by-name/pe/pear-desktop/package.nix
+++ b/pkgs/by-name/pe/pear-desktop/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
makeWrapper,
+ actool,
electron,
python3,
copyDesktopItems,
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmConfigHook
pnpm_10
]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ actool ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix
index 2f5e7f162956..caa8e1f85b48 100644
--- a/pkgs/by-name/po/pocketsphinx/package.nix
+++ b/pkgs/by-name/po/pocketsphinx/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pocketsphinx";
- version = "5.0.4";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "cmusphinx";
repo = "pocketsphinx";
tag = "v${finalAttrs.version}";
- hash = "sha256-DUK3zPPtv+sQhC1dfJXDmwtt3UV6DGacb3mMQUpvVpk=";
+ hash = "sha256-bB/k1KRrdP52MN5iZr2Q2MGWh0JOCsqJxccUyVu2Va0=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index a830390a9ad2..4ca8a8995841 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -54,14 +54,14 @@ let
in
pythonPackages.buildPythonApplication (finalAttrs: {
pname = "pretix";
- version = "2026.5.2";
+ version = "2026.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
tag = "v${finalAttrs.version}";
- hash = "sha256-lamvhcch/EajS8/b1tocAKjCgW0WqFD0wsm4e5o25nM=";
+ hash = "sha256-R77jPwcRgu5+NBR9H0tD14QfbUtoHme6z9maYzDVmPg=";
};
patches = [
diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index b17d5d52a534..1b3aa88c3a92 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pretix-mollie";
- version = "2.5.6";
+ version = "2.5.7";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-mollie";
tag = "v${version}";
- hash = "sha256-XInwUecuC3sEcRpuS+xa7Gb2Isb18SexbZ2+CcUF7/E=";
+ hash = "sha256-LApnvohrNiyqRmBIysxR5ZAMy5nZhPts0znirOUsxq0=";
};
build-system = [
diff --git a/pkgs/by-name/pr/pretix/plugins/payone/package.nix b/pkgs/by-name/pr/pretix/plugins/payone/package.nix
index 1d38c6c820b5..60bff54203cd 100644
--- a/pkgs/by-name/pr/pretix/plugins/payone/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/payone/package.nix
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "pretix-payone";
- version = "1.4.2";
+ version = "1.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-payone";
rev = "v${finalAttrs.version}";
- hash = "sha256-y1BO8Hz/pGKalURCbF3QJ49xn+L/sd8SWTGdCIl43yw=";
+ hash = "sha256-ru944WkeNBYq5XkIMoAFLgGcU2gGxClEYVhCwuZGioI=";
};
build-system = [
diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix
deleted file mode 100644
index 6027d2ce8357..000000000000
--- a/pkgs/by-name/r0/r0vm/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- rustPlatform,
- fetchFromGitHub,
- fetchurl,
- pkg-config,
- perl,
- openssl,
- lib,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
- pname = "r0vm";
- version = "1.0.5";
- src = fetchFromGitHub {
- owner = "risc0";
- repo = "risc0";
- rev = "v${finalAttrs.version}";
- hash = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw=";
- };
-
- buildAndTestSubdir = "risc0/r0vm";
-
- nativeBuildInputs = [
- pkg-config
- perl
- ];
-
- buildInputs = [
- openssl.dev
- ];
-
- doCheck = false;
-
- cargoHash = "sha256-7vN3HRBCzvXT5Xoj+ciCiy+OQ0bC8s4C5360W+1Uld0=";
-
- postPatch =
- let
- # see https://github.com/risc0/risc0/blob/v1.0.5/risc0/circuit/recursion/build.rs
- sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2";
- recursionZkr = fetchurl {
- name = "recursion_zkr.zip";
- url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip";
- hash = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I=";
- };
- in
- ''
- ln -sf ${recursionZkr} ./risc0/circuit/recursion/src/recursion_zkr.zip
- '';
-
- meta = {
- description = "RISC Zero zero-knowledge VM";
- homepage = "https://github.com/risc0/risc0";
- changelog = "https://github.com/risc0/risc0/blob/${finalAttrs.src.rev}/CHANGELOG.md";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ marijanp ];
- mainProgram = "r0vm";
- };
-})
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index fec7c9434630..077143cee220 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -74,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
sqlite
]
++ (with gst_all_1; [
+ gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix
index 4ebeb565775d..dc2b3cce6df6 100644
--- a/pkgs/by-name/re/reqable/package.nix
+++ b/pkgs/by-name/re/reqable/package.nix
@@ -28,11 +28,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "reqable";
- version = "3.1.3";
+ version = "3.2.3";
src = fetchurl {
url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
- hash = "sha256-kOxR9qAEwQu+fFRWemMHFsal4kqC0wzPBkN/pYlEE7E=";
+ hash = "sha256-C1nBAr/vrkMdqG6PyLWatdhom8u+IDUYvQCQd+genS4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rufin/package.nix b/pkgs/by-name/ru/rufin/package.nix
new file mode 100644
index 000000000000..17fdd59bffc6
--- /dev/null
+++ b/pkgs/by-name/ru/rufin/package.nix
@@ -0,0 +1,104 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ cacert,
+ gdk-pixbuf,
+ gettext,
+ gst_all_1,
+ gtk4,
+ libadwaita,
+ pkg-config,
+ wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "rufin";
+ version = "0.7.8";
+
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "screwys";
+ repo = "Rufin";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-TgPjv3s0ERLSnncbtzyr+K1cVscr0PbPxFuDuiPwuV4=";
+ };
+
+ cargoHash = "sha256-hddBiTzJBSk37/Lq7GQ+kTOx6ikLh641B0ISWN2Z2qI=";
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ wrapGAppsHook4
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ gettext
+ gtk4
+ libadwaita
+ ]
+ ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-bad
+ gst-plugins-ugly
+ gst-libav
+ ]);
+
+ cargoBuildFlags = [
+ "-p"
+ "rufin"
+ ];
+
+ doCheck = false;
+
+ postInstall = ''
+ install -Dm644 data/io.github.screwys.Rufin.desktop \
+ "$out/share/applications/io.github.screwys.Rufin.desktop"
+ substituteInPlace "$out/share/applications/io.github.screwys.Rufin.desktop" \
+ --replace-fail "Exec=rufin" "Exec=$out/bin/rufin"
+ install -Dm644 data/io.github.screwys.Rufin.metainfo.xml \
+ "$out/share/metainfo/io.github.screwys.Rufin.metainfo.xml"
+ install -Dm644 data/icons/hicolor/scalable/apps/io.github.screwys.Rufin.svg \
+ "$out/share/icons/hicolor/scalable/apps/io.github.screwys.Rufin.svg"
+ install -Dm644 -t "$out/share/icons/hicolor/scalable/actions" \
+ data/icons/hicolor/scalable/actions/*.svg
+ install -Dm644 -t "$out/share/icons/hicolor/scalable/status" \
+ data/icons/hicolor/scalable/status/*.svg
+ install -Dm644 -t "$out/share/icons/hicolor/512x512/apps" \
+ data/icons/hicolor/512x512/apps/*.png
+ install -Dm644 -t "$out/share/icons/hicolor/64x64/apps" \
+ data/icons/hicolor/64x64/apps/*.png
+
+ for po_file in locales/*.po; do
+ if [ -f "$po_file" ]; then
+ lang="$(basename "$po_file" .po)"
+ mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
+ msgfmt "$po_file" -o "$out/share/locale/$lang/LC_MESSAGES/rufin.mo"
+ fi
+ done
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --set-default RUFIN_LOCALEDIR "$out/share/locale"
+ --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+ )
+ '';
+
+ meta = {
+ description = "Native GTK music client for Jellyfin";
+ homepage = "https://github.com/screwys/Rufin";
+ changelog = "https://github.com/screwys/Rufin/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ screwys ];
+ mainProgram = "rufin";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index 75c900b5b249..3ed050fcaa34 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -13,16 +13,16 @@
buildGoModule (finalAttrs: {
pname = "runme";
- version = "3.16.15";
+ version = "3.16.17";
src = fetchFromGitHub {
owner = "runmedev";
repo = "runme";
rev = "v${finalAttrs.version}";
- hash = "sha256-mU8U/aak0FrQEFanVksM/32bsGx5damuf6BxshTk/M0=";
+ hash = "sha256-1N1VQT+VJd+Pd9rltyEiF6s45GjB/ORqpbzzy9/ABGs=";
};
- vendorHash = "sha256-q+NVyzTCKgyOW94O/YWbmgvgUVh9xlnBOMLWCp/0jrM=";
+ vendorHash = "sha256-51Hp00t/FlOL99uEe5R6ehTkLUfjrR8rw2LE8ERB1og=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/by-name/sa/sagittarius-scheme/fix-roundeven-declaration.patch b/pkgs/by-name/sa/sagittarius-scheme/fix-roundeven-declaration.patch
new file mode 100644
index 000000000000..124cf1f3f744
--- /dev/null
+++ b/pkgs/by-name/sa/sagittarius-scheme/fix-roundeven-declaration.patch
@@ -0,0 +1,38 @@
+diff --git a/src/bignum.c b/src/bignum.c
+index 1a5553d5a..6bcdb5b6b 100644
+--- a/src/bignum.c
++++ b/src/bignum.c
+@@ -1949,6 +1949,7 @@ static SgObject small_bignum_to_string(SgBignum *b, int radix, int use_upper)
+ }
+
+ /* FIXME this is also in number.c */
++#if !defined(__GLIBC__) || !__GLIBC_PREREQ(2, 26)
+ static inline double roundeven(double v)
+ {
+ double r;
+@@ -1966,6 +1967,7 @@ static inline double roundeven(double v)
+ }
+ return r;
+ }
++ #endif
+ /* this is used here */
+ static SgBignum * bignum_expt(SgBignum *b, long exponent);
+
+diff --git a/src/roundeven.inc b/src/roundeven.inc
+index 36d3c5535..1a29eefce 100644
+--- a/src/roundeven.inc
++++ b/src/roundeven.inc
+@@ -31,6 +31,7 @@
+ #include
+ #include
+
++#if !defined(__GLIBC__) || !__GLIBC_PREREQ(2, 26)
+ static inline double roundeven(double v)
+ {
+ double r;
+@@ -50,3 +51,5 @@ static inline double roundeven(double v)
+ }
+
+ #endif
++
++#endif
diff --git a/pkgs/by-name/sa/sagittarius-scheme/package.nix b/pkgs/by-name/sa/sagittarius-scheme/package.nix
index eadaffaf7c21..97541be796a3 100644
--- a/pkgs/by-name/sa/sagittarius-scheme/package.nix
+++ b/pkgs/by-name/sa/sagittarius-scheme/package.nix
@@ -23,17 +23,23 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sagittarius-scheme";
- version = "0.9.12";
+ version = "0.9.14";
src = fetchurl {
- url = "https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/sagittarius-${finalAttrs.version}.tar.gz";
- hash = "sha256-w6aQkC7/vKO8exvDpsSsLyLXrm4FSKh8XYGJgseEII0=";
+ url = "https://github.com/ktakashi/sagittarius-scheme/releases/download/v${finalAttrs.version}/sagittarius-${finalAttrs.version}.tar.gz";
+ hash = "sha256-L0ZKCiSbneWe1+czj83x+bCHPZw1uuYSdJwKHp4qTnk=";
};
+
+ patches = [
+ ./fix-roundeven-declaration.patch
+ ];
+
preBuild = ''
# since we lack rpath during build, need to explicitly add build path
# to LD_LIBRARY_PATH so we can load libsagittarius.so as required to
# build extensions
export ${platformLdLibraryPath}="$(pwd)/build"
'';
+
nativeBuildInputs = [
pkg-config
cmake
@@ -76,9 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
- mostly works O(n)
- Replaceable reader
'';
- homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme";
+ homepage = "https://github.com/ktakashi/sagittarius-scheme";
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ abbe ];
+ broken = stdenv.hostPlatform.isDarwin;
};
})
diff --git a/pkgs/by-name/sa/sail/package.nix b/pkgs/by-name/sa/sail/package.nix
index d15dd6681274..ceca9973d555 100644
--- a/pkgs/by-name/sa/sail/package.nix
+++ b/pkgs/by-name/sa/sail/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sail";
- version = "0.6.3";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "lakehq";
repo = "sail";
tag = "v${finalAttrs.version}";
- hash = "sha256-B5VEm2Hzbi+RBgqpVZE6QNiPneVETlU44JZ8NUWucTY=";
+ hash = "sha256-pCxlGCOLxupgxCtRfUSLbA88dFIWvO16fgibLmydNBQ=";
};
- cargoHash = "sha256-1az/NiHNQGbvf0GpmnxWILqYWH5OT6+4tPaMnvxE5RE=";
+ cargoHash = "sha256-V3FS28H+lGORTFYWaMNeLdz0s+Bv4bo3By5VlIOWiOc=";
cargoBuildFlags = [
"-p"
diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix
index 36bfe673c7af..748358d57eb2 100644
--- a/pkgs/by-name/sc/scipopt-soplex/package.nix
+++ b/pkgs/by-name/sc/scipopt-soplex/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "scipopt-soplex";
- version = "8.0.1";
+ version = "8.0.2";
src = fetchFromGitHub {
owner = "scipopt";
repo = "soplex";
tag = "v${finalAttrs.version}";
- hash = "sha256-NN1UwwvLPfRIpL49UV8f2G4glUmTEywKNXK3m1LFHcg=";
+ hash = "sha256-TW3OSBw8ok64kZedsXYjkO2eFqr0LH8uvrOsi3bwQC4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix
index 3394ddee73cf..cb798eb324f9 100644
--- a/pkgs/by-name/se/seconlay/package.nix
+++ b/pkgs/by-name/se/seconlay/package.nix
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "seconlay";
- version = "0-unstable-2026-06-18";
+ version = "0-unstable-2026-06-22";
src = fetchFromGitLab {
group = "alasca.cloud";
owner = "scl";
repo = "scl-management";
- rev = "bd2d56e3537824537390cb0ba5e9efd4db1410c2";
- hash = "sha256-f/eySU2lq1DwFPZ1CD8P7EeVO8b26Fz6d3PH3OrTm/0=";
+ rev = "0ba7e2283341cdcf54d82546e0f99078c06dce54";
+ hash = "sha256-DevFMumN/Tpqkbu3ktwWGpxzeIv3J1T7vKwr1pcdZXY=";
};
cargoHash = "sha256-aX5HL/zDdrQ+V4vCYZrqlO2vNWuvF4GW2P30jtbv1tE=";
diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 400d7d6c2ab1..a9a19355bdc4 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -13,14 +13,14 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "slint-viewer";
- version = "1.16.1";
+ version = "1.17.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
- hash = "sha256-/hv/5qd0JhV2H91VWjzUh4cOPOLj6/fsXHSwdDSnfCc=";
+ hash = "sha256-2Zjt7kt9tCxDyixa7Az0cPXh3noR2BN7Nxrq2bdxkSs=";
};
- cargoHash = "sha256-9x33UuQGFfHFEsTdSjNnfBlgER4fBIfAmemeWSes304=";
+ cargoHash = "sha256-KaVPQ14QQpabaJVsyhsQ3j546j63Lp16AzQtuz49niY=";
buildInputs = [
qt6.qtbase
diff --git a/pkgs/by-name/sm/smux/package.nix b/pkgs/by-name/sm/smux/package.nix
new file mode 100644
index 000000000000..4bc93de97d24
--- /dev/null
+++ b/pkgs/by-name/sm/smux/package.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ stdenv,
+ rustPlatform,
+ fetchFromGitHub,
+ installShellFiles,
+ makeWrapper,
+ tmux,
+ fzf,
+ zoxide,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "smux";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "Aietes";
+ repo = "smux";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-mc7sspGN4Wf8Jn995S/jsZ0v1s5kgJ0ASn9iGbzH13U=";
+ };
+
+ cargoHash = "sha256-nUJwIOdVmZR+inDz4kYpPTFXREyZyf891ATed6UFIJo=";
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ installShellFiles
+ makeWrapper
+ ];
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ $out/bin/smux completions zsh --dir completions
+ installShellCompletion --zsh completions/_smux
+
+ $out/bin/smux man --dir man
+ installManPage man/*.1
+ installManPage man/*.5
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/smux \
+ --prefix PATH : ${
+ lib.makeBinPath [
+ tmux
+ fzf
+ zoxide
+ ]
+ }
+ '';
+
+ meta = {
+ description = "Tmux session manager with fzf-powered project and template selection";
+ homepage = "https://github.com/Aietes/smux";
+ license = lib.licenses.mit;
+ mainProgram = "smux";
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ aietes ];
+ };
+})
diff --git a/pkgs/by-name/sq/squix/package.nix b/pkgs/by-name/sq/squix/package.nix
index 89ab281abe86..98ef9fe8c859 100644
--- a/pkgs/by-name/sq/squix/package.nix
+++ b/pkgs/by-name/sq/squix/package.nix
@@ -10,16 +10,16 @@ buildGoModule (finalAttrs: {
__structuredAttrs = true;
pname = "squix";
- version = "0.4.0-beta";
+ version = "0.5.0-beta";
src = fetchFromGitHub {
owner = "eduardofuncao";
repo = "squix";
rev = "v${finalAttrs.version}";
- hash = "sha256-lJOXzBgVgRdUi+btu/eOlYXDLhS2FLEnJQ/UjGk5jF4=";
+ hash = "sha256-R/y1fl4MehZ+VDWBtSL3EDzVBsAdCeR5nS687vwk1IM=";
};
- vendorHash = "sha256-JRmNajvCb57dMo8eggOD1m4N01p2RSK8r49pmBB56Z0=";
+ vendorHash = "sha256-kSv3VAQi+qdT29gZAjLmHauItaMFd9NG7bdRtQE1MZo=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/st/steam-art-manager/package.nix b/pkgs/by-name/st/steam-art-manager/package.nix
index 611081155b07..dc9e8eeaf5e4 100644
--- a/pkgs/by-name/st/steam-art-manager/package.nix
+++ b/pkgs/by-name/st/steam-art-manager/package.nix
@@ -6,10 +6,10 @@
let
pname = "steam-art-manager";
- version = "3.16.0";
+ version = "3.16.1";
src = fetchurl {
url = "https://github.com/Tormak9970/Steam-Art-Manager/releases/download/v${version}/steam-art-manager.AppImage";
- hash = "sha256-khjSvATja5ffz7Z6uUmebU3rmgTI6xjNJMxHDBm3O5M=";
+ hash = "sha256-7Lqcj9Q5P29YFt6biFXLlVdWHdlzF/daLIaA2fGY0+A=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 7d30479a5953..91045ea9dce5 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -25,6 +25,8 @@ let
"x86-32"
else if stdenv.hostPlatform.isAarch64 then
"armv8"
+ else if stdenv.hostPlatform.isAarch32 then
+ "armv7"
else
"unknown";
@@ -66,6 +68,7 @@ stdenv.mkDerivation rec {
"PREFIX=$(out)"
"ARCH=${arch}"
"CXX=${stdenv.cc.targetPrefix}c++"
+ "STRIP=${stdenv.cc.targetPrefix}strip"
];
buildFlags = [ "build" ];
@@ -121,6 +124,7 @@ stdenv.mkDerivation rec {
"x86_64-darwin"
"aarch64-linux"
"aarch64-darwin"
+ "armv7l-linux"
];
license = lib.licenses.gpl3Only;
};
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index 60194c39e689..07ea3ca3d66a 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "survex";
- version = "1.4.21";
+ version = "1.4.22";
src = fetchurl {
url = "https://survex.com/software/${finalAttrs.version}/survex-${finalAttrs.version}.tar.gz";
- hash = "sha256-9lmCFrAhI8Zko6wCjkRf7rv+LmKDBTOGekRM3lyz8wI=";
+ hash = "sha256-omli2IhiHP0gQ6fMaiJ/yQUTDfvRTEUNwcTAL7/dnbw=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index 0b95ea03803e..232c451f9902 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -8,8 +8,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "thokr";
version = "0.4.1";
+ __structuredAttrs = true;
+ strictDeps = true;
+
src = fetchFromGitHub {
- owner = "thatvegandev";
+ owner = "jrnxf";
repo = "thokr";
rev = "v${finalAttrs.version}";
sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
@@ -19,9 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Typing tui with visualized results and historical logging";
- homepage = "https://github.com/thatvegandev/thokr";
+ homepage = "https://github.com/jrnxf/thokr";
license = lib.licenses.mit;
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ aiyion ];
mainProgram = "thokr";
};
})
diff --git a/pkgs/by-name/th/thorium-reader/package.nix b/pkgs/by-name/th/thorium-reader/package.nix
index 13ae3960b747..e345900043fa 100644
--- a/pkgs/by-name/th/thorium-reader/package.nix
+++ b/pkgs/by-name/th/thorium-reader/package.nix
@@ -1,12 +1,15 @@
{
lib,
+ stdenv,
buildNpmPackage,
fetchFromGitHub,
nodejs_24,
- makeWrapper,
+ makeShellWrapper,
+ makeBinaryWrapper,
electron,
copyDesktopItems,
makeDesktopItem,
+ desktopToDarwinBundle,
}:
buildNpmPackage (finalAttrs: {
@@ -24,23 +27,39 @@ buildNpmPackage (finalAttrs: {
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-
+ # makeBinaryWrapper is required on Darwin since MacOS is confuses itself
+ # into thinking it needs Rosetta 2 if it encounters a non-MachO executable
+ # in a .app bundle.
+ # Simultaneously, we need makeShellWrapper on linux platforms to pass
+ # electron-specific flags.
nativeBuildInputs = [
- makeWrapper
copyDesktopItems
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ makeShellWrapper
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ makeBinaryWrapper
+ desktopToDarwinBundle
];
- postInstall = ''
- install -Dpm644 resources/icon.png $out/share/icons/thorium-reader.png
+ postInstall =
+ let
+ ozoneFlags = lib.optionalString stdenv.hostPlatform.isLinux ''--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"'';
+ in
+ ''
+ install -Dpm644 resources/icon.png $out/share/icons/thorium-reader.png
- cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/
+ cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/
- makeWrapper '${lib.getExe electron}' "$out/bin/thorium-reader" \
- --add-flags $out/lib/node_modules/EDRLab.ThoriumReader \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
- --set-default ELECTRON_IS_DEV 0 \
- --inherit-argv0
- '';
+ ${
+ if stdenv.hostPlatform.isDarwin then "makeBinaryWrapper" else "makeWrapper"
+ } '${lib.getExe electron}' "$out/bin/thorium-reader" \
+ --add-flags $out/lib/node_modules/EDRLab.ThoriumReader \
+ ${ozoneFlags} \
+ --set-default ELECTRON_IS_DEV 0 \
+ --inherit-argv0
+ '';
desktopItems = [
(makeDesktopItem {
@@ -71,7 +90,10 @@ buildNpmPackage (finalAttrs: {
description = "EPUB reader";
homepage = "https://www.edrlab.org/software/thorium-reader/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ YodaDaCoda ];
+ maintainers = with lib.maintainers; [
+ YodaDaCoda
+ agarmu
+ ];
platforms = lib.platforms.all;
mainProgram = "thorium-reader";
};
diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 4063d42962c2..601293797c4e 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -189,15 +189,15 @@
};
c = {
- version = "0.24.1";
+ version = "0.24.2";
url = "github:tree-sitter/tree-sitter-c";
- hash = "sha256-gmzbdwvrKSo6C1fqTJFGxy8x0+T+vUTswm7F5sojzKc=";
+ hash = "sha256-Juuf57GQI7OAP6O03KtSzyKJAoXtGKjyYJ+sTM1A4mU=";
};
c-sharp = {
- version = "0.23.1";
+ version = "0.23.5";
url = "github:tree-sitter/tree-sitter-c-sharp";
- hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
+ hash = "sha256-N5AAlwQFGGi47cj0m7Te08bA486gwY6NBOx4Qcy4lpo=";
meta = {
license = lib.licenses.mit;
};
@@ -451,9 +451,9 @@
};
devicetree = {
- version = "0.11.1";
+ version = "0.15.0";
url = "github:joelspadin/tree-sitter-devicetree";
- hash = "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=";
+ hash = "sha256-iMmr4zSm6B7goevHE03DMj9scW4ldXS7CV74sKeqGD4=";
meta = {
license = lib.licenses.mit;
};
@@ -777,9 +777,9 @@
};
gdscript = {
- version = "6.0.0";
+ version = "6.1.0";
url = "github:prestonknopp/tree-sitter-gdscript";
- hash = "sha256-S+AF6slDnw3O00C8hcL013A8MU7fKU5mCwhyV50rqmI=";
+ hash = "sha256-QT28TQBt20lMScfF4zb2RJhlPFNekjocOWbvQ2a2yuM=";
meta = {
license = lib.licenses.mit;
};
@@ -1033,10 +1033,10 @@
};
gren = {
- version = "2.0.0-unstable-2025-05-03";
+ version = "2.0.0-unstable-2026-03-31";
url = "github:MaeBrooks/tree-sitter-gren";
- rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930";
- hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k=";
+ rev = "cecd8ce9b18f1803d37682f33b6224978fd04d31";
+ hash = "sha256-E96GzFmQDEb3Uq6sEThxqpRwqEH+JwE/hJ0xM1r2VjI=";
meta = {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
@@ -1372,9 +1372,9 @@
};
julia = {
- version = "0.23.1";
+ version = "0.25.0";
url = "github:tree-sitter/tree-sitter-julia";
- hash = "sha256-jwtMgHYSa9/kcsqyEUBrxC+U955zFZHVQ4N4iogiIHY=";
+ hash = "sha256-Jk2jby7vWWSdnUU8s8zIIfyXFt7keWPJPyTyxPBrqBw=";
meta = {
license = lib.licenses.mit;
};
@@ -1494,7 +1494,7 @@
};
llvm = {
- version = "0-unstable-2025-08-22";
+ version = "1.1.0-unstable-2025-08-22";
url = "github:benwilliamgraham/tree-sitter-llvm";
rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
@@ -1891,10 +1891,9 @@
};
org = {
- version = "1.3.1-unstable-2023-06-19";
- url = "github:milisims/tree-sitter-org";
- rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1";
- hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
+ version = "2.0.4";
+ url = "github:nvim-orgmode/tree-sitter-org";
+ hash = "sha256-76ImC8GMW+yAKG++AHryUi+MYTmtJ5ogygC+bgNMErA=";
meta = {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
@@ -1904,10 +1903,9 @@
};
org-nvim = {
- version = "1.3.1-unstable-2023-06-19";
- url = "github:emiasims/tree-sitter-org";
- rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1";
- hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
+ version = "2.0.4";
+ url = "github:nvim-orgmode/tree-sitter-org";
+ hash = "sha256-76ImC8GMW+yAKG++AHryUi+MYTmtJ5ogygC+bgNMErA=";
meta = {
license = lib.licenses.mit;
};
@@ -2384,9 +2382,9 @@
};
scala = {
- version = "0.25.0";
+ version = "0.26.0";
url = "github:tree-sitter/tree-sitter-scala";
- hash = "sha256-xDp1+i0QLnY18EtiwurW1B4bbeS1qZKNJRxS6Qeb3pw=";
+ hash = "sha256-CnTcQFqYp60rGkLVLRHokUwBenqtWV4hw8boFYNRkbw=";
meta = {
license = lib.licenses.mit;
};
diff --git a/pkgs/by-name/um/umple/2DShapes.ump b/pkgs/by-name/um/umple/2DShapes.ump
new file mode 100644
index 000000000000..427d794b44e5
--- /dev/null
+++ b/pkgs/by-name/um/umple/2DShapes.ump
@@ -0,0 +1,62 @@
+// Taken from https://github.com/umple/Umple/wiki/examples
+
+// 2D Shapes class hierarchy - sample UML class
+// diagram in Umple
+// From Book by Lethbridge and Laganiere, McGraw Hill 2004
+// Object-Oriented Software Engineering:
+// Practical Software Engineering using UML and Java
+// See https://www.site.uottawa.ca/school/research/lloseng/
+
+//Namespace for core of the system.
+namespace Shapes.core;
+
+class Shape2D {
+ center;
+}
+//Abstract
+class EllipticalShape {
+ isA Shape2D;
+ semiMajorAxis;
+}
+//Abstract
+class Polygon {
+ isA Shape2D;
+}
+class Circle {
+ isA EllipticalShape;
+}
+class Ellipse{
+ isA EllipticalShape;
+}
+class SimplePolygon {
+ orientation;
+ isA Polygon;
+}
+class ArbitraryPolygon {
+ points;
+ isA Polygon;
+}
+class Rectangle {
+ isA SimplePolygon;
+ height;
+ width;
+}
+class RegularPolygon {
+ numPoints;
+ radius;
+ isA SimplePolygon;
+}
+
+class Shape2D {
+ public static void main(String [] argc) Java {
+ Shape2D s = new
+ RegularPolygon("0,0","0","3","100");
+ System.out.println(s);
+ }
+
+ public static void main(String [] argc) Python{
+ import RegularPolygon
+ s = RegularPolygon.RegularPolygon("0,0","0","3","100")
+ print(str(s))
+ }
+}
diff --git a/pkgs/by-name/um/umple/deps.json b/pkgs/by-name/um/umple/deps.json
new file mode 100644
index 000000000000..74ff05bdcd87
--- /dev/null
+++ b/pkgs/by-name/um/umple/deps.json
@@ -0,0 +1,622 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+ "com/bmuschko#gradle-docker-plugin/3.2.1": {
+ "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=",
+ "pom": "sha256-slOHkvEGJnUa9sjeAgdH/1E4kntOKfL69KjtOsFKzSE="
+ },
+ "com/github/luben#zstd-jni/1.5.6-3": {
+ "jar": "sha256-9y7eGzklj6+BJ33FjeMMccuuQlNzJVjSzhC1PYtXY9U=",
+ "pom": "sha256-39L6ex0jk5IWkC+ET6XoannN+5IJdg5MBCQrWljUlJA="
+ },
+ "com/netflix/nebula#gradle-ospackage-plugin/12.3.0": {
+ "jar": "sha256-G31BgIxAfGFKaH53ytCTsGRe/axv/3VaYfqsycGx0Tk=",
+ "module": "sha256-48jwwoAZ8Lp9rUUjg+VPZBr2c4OqEOyWeRRcA6fcajQ=",
+ "pom": "sha256-O9fcqwynS7fY3nSxxN4ekJBKIwghlDCxfi9V+pe45/8="
+ },
+ "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/12.3.0": {
+ "pom": "sha256-NbRAjb4z1OaaXaHzN77BhG9M+BiakQi7RXh9BpL/FR8="
+ },
+ "commons-codec#commons-codec/1.17.0": {
+ "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=",
+ "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw="
+ },
+ "commons-io#commons-io/2.16.1": {
+ "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
+ "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
+ },
+ "de/undercouch#gradle-download-task/4.1.1": {
+ "jar": "sha256-6wi1cOQI1GRnBecKlJYU1DnqKxFFXxZSqwMw3olU2rk=",
+ "pom": "sha256-EQnx9xpUJU1ZAzfYudRD+d/AhyjJwdgzVlXMHcyIwLk="
+ },
+ "io/airlift#airbase/112": {
+ "pom": "sha256-GMzRBMvZfrRL1XtowEerf/gfvIAJh/gtgVxorEwjBM4="
+ },
+ "io/airlift#aircompressor/0.27": {
+ "jar": "sha256-/b7zE3oo9juwy5NIeAMIDt50ak7D1CHjbG8MMFw15eQ=",
+ "pom": "sha256-Wqzaib44VjvfO/rHkzNhbAgCymFwcN6ma6ZJUHyZREE="
+ },
+ "javax/inject#javax.inject/1": {
+ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+ "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+ },
+ "org/apache#apache/23": {
+ "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+ },
+ "org/apache#apache/30": {
+ "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+ },
+ "org/apache#apache/31": {
+ "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+ },
+ "org/apache#apache/33": {
+ "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+ },
+ "org/apache/ant#ant-launcher/1.10.15": {
+ "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+ "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+ },
+ "org/apache/ant#ant-parent/1.10.11": {
+ "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY="
+ },
+ "org/apache/ant#ant-parent/1.10.15": {
+ "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+ },
+ "org/apache/ant#ant/1.10.11": {
+ "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M="
+ },
+ "org/apache/ant#ant/1.10.15": {
+ "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+ "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+ },
+ "org/apache/commons#commons-compress/1.21": {
+ "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0="
+ },
+ "org/apache/commons#commons-compress/1.26.2": {
+ "jar": "sha256-kWigMUHY/H7aIaI2DYPMBBK8ux1iBNmSvUjCVzyzxrg=",
+ "pom": "sha256-FChxmJXNCpE67jPiQkuagEsQ8Rl+XTWpzpnPKhF0yw4="
+ },
+ "org/apache/commons#commons-lang3/3.14.0": {
+ "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=",
+ "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554="
+ },
+ "org/apache/commons#commons-parent/52": {
+ "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+ },
+ "org/apache/commons#commons-parent/64": {
+ "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
+ },
+ "org/apache/commons#commons-parent/69": {
+ "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+ },
+ "org/apache/maven#maven-archiver/3.6.3": {
+ "jar": "sha256-g1ZhKYmMejhL/6oRinakBmfVRpSEYLQ+64Vj+hdjWEg=",
+ "pom": "sha256-vBMCWcXhCHonDqjPP4GC/syQv5MROiB01kChpn8QLsQ="
+ },
+ "org/apache/maven#maven-parent/43": {
+ "pom": "sha256-RooSYumqpf6/nWBOKDYmf4FTUfK0Ug8o+xf1PHHjNVQ="
+ },
+ "org/apache/maven/shared#maven-shared-components/43": {
+ "pom": "sha256-YHLdEDvboxmVhMW3PtRbAFZ80+qRjiFgsQvHQ3yegYE="
+ },
+ "org/bouncycastle#bcpg-jdk15on/1.69": {
+ "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=",
+ "pom": "sha256-2iKA/jlan+d4adxcwAqpvuiPaUx8R4XqEHOXIrafrU8="
+ },
+ "org/bouncycastle#bcprov-jdk15on/1.69": {
+ "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=",
+ "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4="
+ },
+ "org/codehaus/plexus#plexus-archiver/4.10.0": {
+ "jar": "sha256-TAeBT/SjkZmZmugruh44qk8lY3Rn/KxqZu1jp2U1eZo=",
+ "pom": "sha256-k8oAH9M9pT04t09trxnnG8lzbtYUMJH/kAPNTAWs5sk="
+ },
+ "org/codehaus/plexus#plexus-interpolation/1.27": {
+ "jar": "sha256-P7T7YUP9+WQCTDy3OFUVJLnqhOXCEc1mDFWa0HA+UjA=",
+ "pom": "sha256-1U+8vEOZ41IyKHSkEoudKP6f4Vg/iew2HeJC6jjTP5s="
+ },
+ "org/codehaus/plexus#plexus-io/3.5.0": {
+ "jar": "sha256-ll7SiRLPGuTGKBEsQAngwZgZvETtXbivVO5e2iEDaj4=",
+ "pom": "sha256-9bhs0iOgv0umSd4Z5+jk4fFDRP9jb4sAJMicRtKMydg="
+ },
+ "org/codehaus/plexus#plexus/16": {
+ "pom": "sha256-aNTu1lo9u8NC7YDdE4++nGfLf7TCq8T1IBzbW59kWGg="
+ },
+ "org/codehaus/plexus#plexus/18": {
+ "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0="
+ },
+ "org/junit#junit-bom/5.10.0": {
+ "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+ "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+ },
+ "org/junit#junit-bom/5.10.1": {
+ "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+ "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+ },
+ "org/junit#junit-bom/5.10.2": {
+ "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+ "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+ },
+ "org/junit#junit-bom/5.10.3": {
+ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+ "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+ },
+ "org/junit#junit-bom/5.8.0-M1": {
+ "module": "sha256-vgUUcTA6UD9MIkZwdbJ0kEE3fd1tWoywc53tZ9kW2C0=",
+ "pom": "sha256-dxREMv/Gi9mKeQqxBpYZ2RAyz8Dk4TwIFjqgPaNv1uI="
+ },
+ "org/redline-rpm#redline/1.2.10": {
+ "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=",
+ "pom": "sha256-B6tuIriDJfDPdNQuiaZjQY5Vb+pXmMZnjSY8+YJuxC4="
+ },
+ "org/slf4j#slf4j-api/1.7.36": {
+ "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+ "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
+ },
+ "org/slf4j#slf4j-api/1.7.5": {
+ "pom": "sha256-r6+OdAGbIw0/Vv3XyT+xBwwNyjTz0tWrXeqfxha9XKQ="
+ },
+ "org/slf4j#slf4j-parent/1.7.36": {
+ "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
+ },
+ "org/slf4j#slf4j-parent/1.7.5": {
+ "pom": "sha256-xDvFoCLb/Z3oK+Iy3/5GIIy8feEsFDhbXagk4zHlNbs="
+ },
+ "org/sonatype/forge#forge-parent/4": {
+ "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw="
+ },
+ "org/sonatype/oss#oss-parent/9": {
+ "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+ },
+ "org/sonatype/plexus#plexus-cipher/1.4": {
+ "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=",
+ "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0="
+ },
+ "org/sonatype/plexus#plexus-sec-dispatcher/1.4": {
+ "jar": "sha256-2nPjK1gTLmTa8SJp/Z0BHAswPyNIQPF5kIclpjK2tXw=",
+ "pom": "sha256-tNbx4rkXL7dRDhixSupMpaBkb8izotcKLr/6b+SHh9w="
+ },
+ "org/sonatype/spice#spice-parent/12": {
+ "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4="
+ },
+ "org/tukaani#xz/1.4": {
+ "pom": "sha256-/kqLT1R/okQ0L7r0pOgPDEg3HYXMQBtYUViRKENiWJI="
+ },
+ "org/tukaani#xz/1.9": {
+ "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+ "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+ },
+ "org/vafer#jdeb/1.14": {
+ "jar": "sha256-K5maQLdp9syj+zgbjxEY/DRLiKvi84uhstUyV/ifNgI=",
+ "pom": "sha256-UhZkuBz7sPxlYawUMG105wkNjrgh1De0de9jwlxaoIc="
+ },
+ "org/yaml#snakeyaml/1.19": {
+ "jar": "sha256-CnsQY/yuuAa0C3KNAbk2HTjh7Y3rk/lFmU/sfBdh2tE=",
+ "pom": "sha256-LPLw3zc1cHbH8clmIV6L5urKSM670TZHjaZ0mpjjomE="
+ }
+ },
+ "https://repo1.maven.org/maven2": {
+ "aopalliance#aopalliance/1.0": {
+ "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=",
+ "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs="
+ },
+ "com/google#google/5": {
+ "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg="
+ },
+ "com/google/code/findbugs#jsr305/3.0.2": {
+ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+ "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+ },
+ "com/google/errorprone#error_prone_annotations/2.3.4": {
+ "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=",
+ "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0="
+ },
+ "com/google/errorprone#error_prone_parent/2.3.4": {
+ "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY="
+ },
+ "com/google/guava#failureaccess/1.0.1": {
+ "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+ "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+ },
+ "com/google/guava#guava-parent/14.0.1": {
+ "pom": "sha256-5aUl7Ttdf/8qjalkHgy5hcf9uEfjCB4qNz2vLnADm2M="
+ },
+ "com/google/guava#guava-parent/26.0-android": {
+ "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+ },
+ "com/google/guava#guava-parent/30.1-jre": {
+ "pom": "sha256-4q+3R+vE/iMo1qkPqIxdioO7HjIGG7mxD/Q+LEetbnM="
+ },
+ "com/google/guava#guava/14.0.1": {
+ "pom": "sha256-PdSpktU+tSShxlRqJLhTszKyZSB1XiayXTgQATFCS3s="
+ },
+ "com/google/guava#guava/30.1-jre": {
+ "jar": "sha256-5t0HL50/4CpGAGiDgL1CK9rBhMr2/iQYz90JNPCUMqo=",
+ "pom": "sha256-lkbUzVAJTUq+UH5VXT921340pMVWayL7Ew71XU676Sc="
+ },
+ "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+ "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+ "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+ },
+ "com/google/guava/guava/maven-metadata": {
+ "xml": {
+ "groupId": "com.google.guava",
+ "lastUpdated": "20260414193116",
+ "release": "33.6.0-jre"
+ }
+ },
+ "com/google/inject#guice-parent/3.0": {
+ "pom": "sha256-XG44w1mE5VAzSY/CLRUZslAcNqvwif1EUIFJH2/M6Ro="
+ },
+ "com/google/inject#guice/3.0": {
+ "jar": "sha256-GlnQQh/9NVzAtwtC3xwumvdEyKLQyS2jefX8ovB/HSI=",
+ "pom": "sha256-IogoDGRaFuamSRGbP0PrysKmmCFrgFssbw7uo5GR7cA="
+ },
+ "com/google/j2objc#j2objc-annotations/1.3": {
+ "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+ "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
+ },
+ "com/ibm/icu#icu4j/52.1": {
+ "pom": "sha256-9fXj+DzEgf4xtKcZAY0/tWpTa5pkGyvcN4kBYkSYhkY="
+ },
+ "io/github/classgraph#classgraph/4.8.35": {
+ "jar": "sha256-S+jLCgnY0HfSfyj6J/KnwQuEYwxj4cD2IH1EvfLO78g=",
+ "pom": "sha256-gzF7P8oJQDa082OVdOs94t8QKub80+Yr3PaF9lkg/ak="
+ },
+ "javax/inject#javax.inject/1": {
+ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+ "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+ },
+ "junit#junit/4.13.2": {
+ "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+ "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+ },
+ "log4j#log4j/1.2.15": {
+ "pom": "sha256-SkgVA4q+8Kdy2zj/BvmFx9I9wxCb+Hf12DMpQm3afa8="
+ },
+ "log4j#log4j/1.2.16": {
+ "pom": "sha256-Kx6fEFXPC0pGWar0dLZehC1cHcWAtcTgI472NHDREP0="
+ },
+ "log4j#log4j/1.2.17": {
+ "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=",
+ "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4="
+ },
+ "net/java/dev/jna#jna-platform/5.18.1": {
+ "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
+ "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
+ },
+ "net/java/dev/jna#jna/5.18.1": {
+ "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
+ "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
+ },
+ "net/sf/jopt-simple#jopt-simple/4.4": {
+ "jar": "sha256-PKo+nzO/XYuMCu/qjPFmp/RomIBCHESkLZzqDTrG4u0=",
+ "pom": "sha256-grxfPGJDqK9v7dC7tLUQvUNQOYrRqH1CBcuB6ltMkXQ="
+ },
+ "org/antlr#antlr-master/3.2": {
+ "pom": "sha256-fRkllZP6jp3uFclxr/qZy/4mP4mAhXSwLzxkntc9GjU="
+ },
+ "org/antlr#antlr-runtime/3.2": {
+ "jar": "sha256-bZ+ZcgLMAtTU+j1OhObS0946Gx+VHpoag7QNAnmlA4k=",
+ "pom": "sha256-7LFOJegtITLWPHQuMMML0qWxiVQfmPGaVAaLVvHz1o8="
+ },
+ "org/apache/ant#ant-launcher/1.9.15": {
+ "jar": "sha256-O2x8C7wGSm1AA5+ZX23Dm8O3mjs18+lH7VRcS2Yb2Us=",
+ "pom": "sha256-g2t7bhQDQxWvlcxFLrUnz2kS4vo/hOxRQAYIc3zaBT8="
+ },
+ "org/apache/ant#ant-parent/1.9.15": {
+ "pom": "sha256-PS+Wc7hr27MK3bdcWdnP/BKDOVfX6t1SSZuOpBMW9DQ="
+ },
+ "org/apache/ant#ant/1.9.15": {
+ "jar": "sha256-VZh4OBCCR0ZVx0DoNzosmZD+Sph6pMJvOccizvXELMw=",
+ "pom": "sha256-0VF8gmrVqm32WpXqw6h+Zult7Qf/YiR3bbhKZb6rpTs="
+ },
+ "org/checkerframework#checker-qual/3.5.0": {
+ "jar": "sha256-cpmQs/GKlWBvwlc4NraVi820TLUr+9G3qpwznP81paQ=",
+ "pom": "sha256-KDazuKeO2zGhgDWS5g/HZ7IfLRkHZGMbpu+gg3uzVyE="
+ },
+ "org/eclipse/emf#org.eclipse.emf.common/2.17.0": {
+ "jar": "sha256-W4qj/X71SsaVqnPGv+opmpviz3Ry7WuKn6hN/QAL3LM=",
+ "pom": "sha256-zYf3dhgsAKnai7KIbXx7rLvoMjJsKw4sQ3rrs7fvAVg="
+ },
+ "org/eclipse/emf#org.eclipse.emf.common/2.45.0": {
+ "pom": "sha256-Momjqyn/zL6YIl3+lfnffSiuQz6xrNNUZkZQfzXtqwc="
+ },
+ "org/eclipse/emf#org.eclipse.emf.ecore.xmi/2.16.0": {
+ "jar": "sha256-2NoRRs2DZ19dVBf92R/Inyr0tD5KMBEGYTJplNxxF20=",
+ "pom": "sha256-McYAPeGYu++mcsQ9ixI5b+K0DnXH8M+N6pvOkGZix18="
+ },
+ "org/eclipse/emf#org.eclipse.emf.ecore.xmi/2.40.0": {
+ "pom": "sha256-Vo7z0mmi/HE1/EBvXJ5JbdQjQ6CB3xufaaMj9fHuSzE="
+ },
+ "org/eclipse/emf#org.eclipse.emf.ecore/2.20.0": {
+ "jar": "sha256-nuU5o8UO88/LqjqF808EHupoKtRZ0+lW33dp9rKZGzY=",
+ "pom": "sha256-6aoQO2xLlRT1Par3jX/y2/B6zexP7uKVCb4I6hvsOSw="
+ },
+ "org/eclipse/emf#org.eclipse.emf.ecore/2.42.0": {
+ "pom": "sha256-9J8c6yPnlQi1R0TqD5Ii8y97jTTpQq2rDrmKwv6JvtY="
+ },
+ "org/eclipse/emf/org.eclipse.emf.common/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.emf",
+ "lastUpdated": "20260224162236",
+ "release": "2.45.0"
+ }
+ },
+ "org/eclipse/emf/org.eclipse.emf.ecore.xmi/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.emf",
+ "lastUpdated": "20260224162235",
+ "release": "2.40.0"
+ }
+ },
+ "org/eclipse/emf/org.eclipse.emf.ecore/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.emf",
+ "lastUpdated": "20260224162245",
+ "release": "2.42.0"
+ }
+ },
+ "org/eclipse/jdt#org.eclipse.jdt.compiler.apt/1.3.1100": {
+ "jar": "sha256-zJqUAyG8X/IdsjBRdcPGYBYYoeosDbr65NGJBX5fVsI=",
+ "pom": "sha256-96v/7G1ehU+ora9ZJyT7rFFM8gKsaO9Q6ZTBzx9Dyjg="
+ },
+ "org/eclipse/jdt#org.eclipse.jdt.compiler.tool/1.2.1000": {
+ "jar": "sha256-XVB7Co4RPPyccS9TBuzp0ON3VEfIEfyl+EkMNhWnVLQ=",
+ "pom": "sha256-qryopLNthGmhzCQ4AnWupz5YZqvAl8spXubpXK9Lpwk="
+ },
+ "org/eclipse/jdt#org.eclipse.jdt.core/3.17.0": {
+ "pom": "sha256-F04xhLHTa8gqBjdPLhcacmXRXgjCDDXqtL8y4OGdG48="
+ },
+ "org/eclipse/jdt#org.eclipse.jdt.core/3.23.0": {
+ "jar": "sha256-sf7D5ZoMCcXisipnc3pUFithF/FQA3iya+SQgWw0Q8I=",
+ "pom": "sha256-IHpNbAWKRyIzp/n11ufbRdIG1szT9c6jTgQHuoQm0yU="
+ },
+ "org/eclipse/platform#org.eclipse.core.commands/3.12.500": {
+ "jar": "sha256-RHEzYuVe0o5ttdLDG/Z1JP7wh2RaRNwyOdrGDs4BfLk=",
+ "pom": "sha256-yD+4t0dc62ANfijxwyfGjhzSaFHeyEEKthn/9W17SoI="
+ },
+ "org/eclipse/platform#org.eclipse.core.contenttype/3.9.800": {
+ "jar": "sha256-4MLblmANUZzjanX5t8lxr9KHDS0Fnu5L8kNtmzOqC40=",
+ "pom": "sha256-vZ20X3R3JIQpxxz4RlcC2r+xUgzoU0+dwl1BeOu1iXs="
+ },
+ "org/eclipse/platform#org.eclipse.core.expressions/3.9.600": {
+ "jar": "sha256-7/hM/I8g4jVEjDpk+kwvpl+X4O0I0mMC8zG2d9/3emY=",
+ "pom": "sha256-LoubbvcTC0GLfGQY7X7mTAo7nd806z3Va/qLIzr2qtI="
+ },
+ "org/eclipse/platform#org.eclipse.core.filesystem/1.11.400": {
+ "jar": "sha256-b3C5XRS5DsV7lMXj26fh0YlnnPmkvEUm6ckb7tfWoO8=",
+ "pom": "sha256-sQA8+u8BN+YzwThrzFfbCl5Yelm1Fx5We6Uwz6u/jMU="
+ },
+ "org/eclipse/platform#org.eclipse.core.jobs/3.15.700": {
+ "jar": "sha256-NwFReae5uQ0Wy5L0sb5gg6Gm2tJUKPqPa4libwzC2nk=",
+ "pom": "sha256-OUVAotjHPjVRHz1f8J2fNkdm4P4steb4V8Tfqwl9Ot8="
+ },
+ "org/eclipse/platform#org.eclipse.core.jobs/3.15.800": {
+ "pom": "sha256-4BqLscYYZjcJv4yyFznslhvc6MVVXQTn+3VzvjD2jWY="
+ },
+ "org/eclipse/platform#org.eclipse.core.resources/3.24.0": {
+ "jar": "sha256-4mcC2BfWwm6D5Nbn5v9HYaU3dEh6JHsfr3yXXTlWg/4=",
+ "pom": "sha256-2LzuUCsfE1UK/R4pjZCLeh4cbNveVUj2joroopFNShE="
+ },
+ "org/eclipse/platform#org.eclipse.core.runtime/3.19.0": {
+ "pom": "sha256-5d9UsnVbbVg/aoJOpuRLwYBQKfaaF6M8GISSOPCCMnQ="
+ },
+ "org/eclipse/platform#org.eclipse.core.runtime/3.34.200": {
+ "jar": "sha256-tPNqCssI8D0LPbVLIfxWOMggxEdEakELpJalBw+jQ2M=",
+ "pom": "sha256-VUfhQDP4BRrlX0qDhwRsdAk7UgNs3DVu9p6lGOrn5uw="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.app/1.7.600": {
+ "jar": "sha256-/TUzmINRB2CPVUd5pukYkXJe+5Tg9XVZ0Ks86kthVsc=",
+ "pom": "sha256-cZhnUaan5uJyMJs6ZqySGUPplQlqXIgI1C6aDMJR1eg="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.common/3.13.0": {
+ "pom": "sha256-+3O5zurY3z4CrkYhA323gKKaURHCIDHszq+BXLmw35A="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.common/3.20.300": {
+ "pom": "sha256-ALs//vT1/wr/lXaIGYlvxY1kxitKkEc60niE6P0viFI="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.common/3.20.400": {
+ "jar": "sha256-QjtYYTpOm7vm7CI5aQ/zKfE9aeuyhAal+dcFFqZkOiQ=",
+ "pom": "sha256-uGupfIVGTB0QapWYJrNFQkoubQ1bCI/Sf/8FGW/xS+8="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.preferences/3.12.100": {
+ "jar": "sha256-/QToGiirMra7BzKG6yk8RLdgF2/PHjXvFWFNYt+CD4Y=",
+ "pom": "sha256-IYxiWoWw5QQU6dGRKFYUtrL+qf9/0TITKm4PkyQzMZY="
+ },
+ "org/eclipse/platform#org.eclipse.equinox.registry/3.12.600": {
+ "jar": "sha256-T4zXJoFEa1mDkKjCTum5mW9uTF+r7QIrUL0m9vWgv2w=",
+ "pom": "sha256-Kwg3b6gZu5Q3vHDKJM6w8NtE3gE/63F9vmmaKU+2MSc="
+ },
+ "org/eclipse/platform#org.eclipse.osgi/3.23.100": {
+ "pom": "sha256-gph5O0PkohKzeJ6c/dpZEqEGTCkPTgr4pUrLSNB5TuQ="
+ },
+ "org/eclipse/platform#org.eclipse.osgi/3.24.200": {
+ "jar": "sha256-v+g/zR+gNOuamGs8tuXisY27rLZ+q9qtLaMoBOzYxlo=",
+ "pom": "sha256-sMVs+qxqcAh+RUJXzABLfTb7uYk9vu5N64fGISWGERY="
+ },
+ "org/eclipse/platform#org.eclipse.text/3.14.700": {
+ "jar": "sha256-QHX3qjoZ8s5v/R9VXrwIhOBlzEC1n3HXdNoJKMFCNVU=",
+ "pom": "sha256-CUpEEYG78vzd7jYOoXXKFPO/NfAVtPlNpV6CTltDM+0="
+ },
+ "org/eclipse/platform/org.eclipse.core.contenttype/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20251208072734",
+ "release": "3.9.800"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.core.filesystem/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20251208072743",
+ "release": "1.11.400"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.core.jobs/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20260608064403",
+ "release": "3.15.800"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.core.resources/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20260608064402",
+ "release": "3.24.0"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.equinox.app/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20260309141957",
+ "release": "1.7.600"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.equinox.preferences/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20251208072801",
+ "release": "3.12.100"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.equinox.registry/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20251208072814",
+ "release": "3.12.600"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.osgi/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20260608064445",
+ "release": "3.24.200"
+ }
+ },
+ "org/eclipse/platform/org.eclipse.text/maven-metadata": {
+ "xml": {
+ "groupId": "org.eclipse.platform",
+ "lastUpdated": "20260608064456",
+ "release": "3.14.700"
+ }
+ },
+ "org/eclipse/xtend#org.eclipse.xtend.core/2.26.0.M1": {
+ "jar": "sha256-cSJpnGjNwDzHCD+416m8Fu9X81Zs+VHb8iAu59hBPP4=",
+ "pom": "sha256-gAUnNNtYJj1M81i7Xnts2YM8SOpYrrEz6OU7HJh6bnk="
+ },
+ "org/eclipse/xtend#org.eclipse.xtend.lib.macro/2.26.0.M1": {
+ "jar": "sha256-0JD3xc6lbz4fU5zR7DBJF9vcW0CatfhJH+fRKweHaqc=",
+ "pom": "sha256-noRJeVGBYI2AALRM4yFw2UzP1JaN1V2KgGNyqYnrPj8="
+ },
+ "org/eclipse/xtend#org.eclipse.xtend.lib.macro/2.9.0.beta3": {
+ "pom": "sha256-mrnejeg674gkxdP7ejRO4ucqCkFKvjRaU9fQu3QMK/8="
+ },
+ "org/eclipse/xtend#org.eclipse.xtend.lib/2.26.0.M1": {
+ "jar": "sha256-WDcavdMrnHaEcXE9KbTTOVE0Mhxu1u6sMDT2H6DO868=",
+ "pom": "sha256-cdrQr0y9l+9VG/GjtdISVz6Wm8Ahcqvn24VOLLr3on8="
+ },
+ "org/eclipse/xtend#org.eclipse.xtend.lib/2.9.0.beta3": {
+ "pom": "sha256-tvTav1nQs3hAJpu5l9g8blJklfs3PgS/4gyUkro7WrY="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.common.types/2.26.0.M1": {
+ "jar": "sha256-J4CbsOaZyXIjvMqgWb5gUsgm7cjOTWjk4a8c8OA8WpI=",
+ "pom": "sha256-KBblpXkaPCgF70MCp2FD5bosfgHNRWSYJmKi6NBNzG4="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.parent/2.9.0.beta3": {
+ "pom": "sha256-iitPMtKIuMIpKhznz1PSniKrUJLrQJCGHk7fWH5dxXE="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.tycho.parent/2.9.0.beta3": {
+ "pom": "sha256-aw4ohgIotMlzzRlMG75OAWJ3Z9eFa8IPLXhJdsqM3Hc="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.ui/2.9.0.beta3": {
+ "jar": "sha256-LdJ4gAHfV5Tdh3PcoWTLVf9loRXq2KyoTxcQIv1YXEk=",
+ "pom": "sha256-ijONMPrjEGreQAPcjqK4D4UYWks2MIvqLmXwNet5xao="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.util/2.26.0.M1": {
+ "jar": "sha256-GjUOUkVY9wqbaPoU1CpkzfSHJZSIMmbVHVM6XtHe87k=",
+ "pom": "sha256-PiFttra2eWhlgERIshGKlnMU088VE07lShOxcmNCcls="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.util/2.9.0.beta3": {
+ "pom": "sha256-Av48mI0vXSEvRU1Dd6sW87+kuCmmriSDjmW5mKXfXkM="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.xbase.lib/2.26.0.M1": {
+ "jar": "sha256-6t00qIDs00kIirnsc8/esHRlaL8lhACb0CUt5EgNjZM=",
+ "pom": "sha256-RQGK9XRXRnva6chBnh86GlIXMPixtWsV9vFihq2YW7M="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.xbase.lib/2.9.0.beta3": {
+ "pom": "sha256-PdmWaS7jFJPKsPuHXR8dH/TYVJR9w9h7/v4wXwn+ICM="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext.xbase/2.26.0.M1": {
+ "jar": "sha256-jk8M2/NovIVnk1V6qrrBiRUwTMv6thT0GfAkY+w+Z/o=",
+ "pom": "sha256-WwQhe/Y1tnJ+6AvbD7ou1Zc6mcznyJuAqCO932xde5o="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext/2.26.0.M1": {
+ "jar": "sha256-AJqnshwnSwjN0HYZLCYrSTwfRsk4O1Uzo0HvnAr/Uro=",
+ "pom": "sha256-bVw1Q8nsT1RgOUbQWaMwYnWDRJTMXnBHMTuf4gTgqkk="
+ },
+ "org/eclipse/xtext#org.eclipse.xtext/2.9.0.beta3": {
+ "pom": "sha256-sdYgpLPTQpjRnvmniZuQG4ujVrWmWsBikJHChbNOQRs="
+ },
+ "org/eclipse/xtext#xtext-dev-bom/2.26.0.M1": {
+ "pom": "sha256-rS44hS+MKr4hxk2eMIfDDiqruej4VkLEjYK+CUTf4hY="
+ },
+ "org/hamcrest#hamcrest-core/1.3": {
+ "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+ "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+ },
+ "org/hamcrest#hamcrest-parent/1.3": {
+ "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+ },
+ "org/osgi#org.osgi.service.prefs/1.1.2": {
+ "jar": "sha256-Q8fIcHEONjQF1CLaZTzODXmKRTf3bkkw95vOrdOlU0U=",
+ "pom": "sha256-bqSDzqF36RMQmExkUuaUqiCAGVG1AfF8uboRQyjCzCY="
+ },
+ "org/osgi#osgi.annotation/8.0.1": {
+ "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=",
+ "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM="
+ },
+ "org/ow2#ow2/1.5": {
+ "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+ },
+ "org/ow2/asm#asm-analysis/9.1": {
+ "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=",
+ "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY="
+ },
+ "org/ow2/asm#asm-commons/9.1": {
+ "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=",
+ "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38="
+ },
+ "org/ow2/asm#asm-tree/9.1": {
+ "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=",
+ "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw="
+ },
+ "org/ow2/asm#asm/9.1": {
+ "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=",
+ "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0="
+ },
+ "org/sonatype/forge#forge-parent/6": {
+ "pom": "sha256-nF981SJqyMN5jLH4AMAx997cFgbcUNwpVnh3yCJEWac="
+ },
+ "org/sonatype/oss#oss-parent/7": {
+ "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+ },
+ "org/sonatype/oss#oss-parent/9": {
+ "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+ },
+ "org/sonatype/sisu/inject#cglib/2.2.1-v20090111": {
+ "pom": "sha256-SvNVR7tds+Sft1CGWvDjM6/cgubm19itvRwUEd+tYIE="
+ }
+ },
+ "https://repository.jboss.org": {
+ "nexus/content/groups/public-jboss/com/google/guava/guava/maven-metadata": {
+ "xml": {
+ "groupId": "com.google.guava",
+ "lastUpdated": "20160429131712",
+ "release": "20.0-hal"
+ }
+ }
+ }
+}
diff --git a/pkgs/by-name/um/umple/fix-manpage.patch b/pkgs/by-name/um/umple/fix-manpage.patch
new file mode 100644
index 000000000000..19f01ec569ba
--- /dev/null
+++ b/pkgs/by-name/um/umple/fix-manpage.patch
@@ -0,0 +1,13 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -605,8 +605,8 @@ task packageAllJars {
+
+ // Generate options text from help message
+ task genOptions(type:Exec) {
+- workingDir "${rootProject.projectDir.toString()}/dist/"
+- commandLine 'java', '-jar', 'umple.jar', '-help'
++ workingDir "${rootProject.projectDir.toString()}/dist/gradle/libs/"
++ commandLine 'java', '-jar', '@UMPLE_OUT_JAR@', '-help'
+ standardOutput = new ByteArrayOutputStream()
+ doLast {
+ def strings = standardOutput.toString().split('-----------')
diff --git a/pkgs/by-name/um/umple/gradle-8-compat.patch b/pkgs/by-name/um/umple/gradle-8-compat.patch
new file mode 100644
index 000000000000..f05059be10ee
--- /dev/null
+++ b/pkgs/by-name/um/umple/gradle-8-compat.patch
@@ -0,0 +1,48 @@
+diff --git a/build.gradle b/build.gradle
+index 897ab9d0a..ff84824f9 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -10,7 +10,7 @@ buildscript {
+ }
+
+ plugins {
+- id 'nebula.ospackage' version '9.1.1'
++ id 'com.netflix.nebula.ospackage' version '12.3.0'
+ }
+
+ String runGit(List args, String fallback) {
+@@ -376,7 +376,6 @@ sourceSets {
+ ]
+ exclude '**/*.ump', '**/.git*'
+ }
+- java.outputDir = file(rootProject.ext.classfileOutputDir)
+ }
+ test {
+ compileClasspath = files(
+@@ -394,10 +393,16 @@ sourceSets {
+ ]
+ exclude '**/*.ump', '**/.git*'
+ }
+- java.outputDir = file(rootProject.ext.testClassfileOutputDir)
+ }
+ }
+
++tasks.named("compileJava") {
++ destinationDirectory.set(file(rootProject.ext.classfileOutputDir))
++}
++
++tasks.named("compileTestJava") {
++ destinationDirectory.set(file(rootProject.ext.testClassfileOutputDir))
++}
+
+ // ===============
+ // Jar packaging
+@@ -2011,7 +2016,7 @@ task executeDocJar (type: JavaExec){
+ def drop = fileTree ("${rootProject.ext.umpleoscripts}/dropbox") {
+ include '*.js'
+ }
+- files = files (
++ files = project.files (
+ 'umpleonline/scripts/prototype.js',
+ 'umpleonline/scripts/dom.js',
+ 'umpleonline/scripts/ajax.js',
diff --git a/pkgs/by-name/um/umple/package.nix b/pkgs/by-name/um/umple/package.nix
new file mode 100644
index 000000000000..d3234708baa2
--- /dev/null
+++ b/pkgs/by-name/um/umple/package.nix
@@ -0,0 +1,159 @@
+{
+ lib,
+ stdenvNoCC,
+ runCommand,
+ fetchurl,
+ fetchFromGitHub,
+ gradle_8, # incompatible with gradle 9+
+ installShellFiles,
+ makeBinaryWrapper,
+ opentxl,
+ jre,
+}:
+let
+ versions = lib.importJSON ./versions.json;
+ inherit (versions.umple) version longVersion;
+
+ # Required for bootstrapping
+ umpleJar = fetchurl versions.umpleJar;
+
+ # Not managed through Gradle
+ joptSimple = fetchFromGitHub {
+ owner = "jopt-simple";
+ repo = "jopt-simple";
+ tag = "jopt-simple-4.4";
+ hash = "sha256-sOQaEq2qzvEwJzwZIcMQus3tetzA6O2VPl8XUJAtupM=";
+ };
+
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "umple";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "umple";
+ repo = "umple";
+ tag = "v${version}";
+ hash = "sha256-BPy1L3bzvKoywM0srv36SXVe8psaY/m0bljy30z5dr8=";
+ };
+
+ patches = [
+ # The upstream project uses some deprecated Gradle 7 features and old dependencies
+ ./gradle-8-compat.patch
+ # Replaces the logic to determine the current version (requires Git at runtime)
+ ./replace-version.patch
+ # Fixes broken working directory + updates Jar paths for manpage generation task
+ ./fix-manpage.patch
+ ];
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ nativeBuildInputs = [
+ gradle_8
+ gradle_8.jdk
+ installShellFiles
+ makeBinaryWrapper
+ opentxl
+ ];
+
+ postPatch = ''
+ # Set variables from patches + use Nix store paths
+ substituteInPlace build.gradle \
+ --replace-fail @UMPLE_VERSION@ "${longVersion}" \
+ --replace-fail @UMPLE_OUT_JAR@ "umple-${longVersion}.jar" \
+ --replace-fail '${"$"}{rootProject.projectDir.toString()}/libs/umple-latest.jar' '${umpleJar}' \
+ --replace-fail '${"$"}{rootProject.projectDir.toString()}/dist/gradle/libs/vendors/jopt-simple-jopt-simple-4.4/src/main/java/joptsimple' '${joptSimple}/src/main/java/joptsimple'
+
+ # Replace outdated version in manpage
+ substituteInPlace build/package-files/template.1 \
+ --replace-warn 1.31.1 "${longVersion}"
+
+ # Replace @UMPLE_VERSION@ template in original source code with actual version.
+ # This ensures that emitted files include comments indicating the proper version,
+ # e.g. "Generated with Umple x.y.z"
+ find . -type f \( -name '*.java' -o -name '*.ump' \) -exec sed -i "s/@UMPLE_VERSION@/${longVersion}/g" {} +
+ '';
+
+ mitmCache = gradle_8.fetchDeps {
+ inherit (finalAttrs) pname;
+ data = ./deps.json;
+ };
+
+ __darwinAllowLocalNetworking = true;
+
+ gradleBuildTask = "quickbuild";
+
+ gradleFlags = [
+ # Network-dependent tasks
+ "--exclude-task=downloadUmpleJar"
+ "--exclude-task=downloadJOptSimpleVendorZip"
+ "--exclude-task=downloadAndUnzipJOptSimpleVendor"
+ "--exclude-task=prepareJOptSimpleVendor"
+ # Tasks that try to modify readonly files
+ "--exclude-task=cleanUpUmple"
+ ];
+
+ postBuild = ''
+ gradle --no-daemon genManpage
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,share/java}
+ cp dist/gradle/libs/umple*.jar $out/share/java
+ installManPage build/package-files/umple.1
+
+ pushd $out/share/java
+ # Strip version suffix from filenames
+ for file in *.jar; do
+ mv "$file" "''${file%-${longVersion}.jar}.jar"
+ done
+ # Create wrappers
+ for file in *.jar; do
+ makeWrapper ${lib.getExe jre} "$out/bin/''${file%.jar}" \
+ --add-flags "-jar $out/share/java/$file"
+ done
+ popd
+
+ runHook postInstall
+ '';
+
+ passthru = {
+ updateScript = ./update.sh;
+
+ bootstrap = umpleJar;
+
+ tests."2dshapes" =
+ runCommand "umple-test"
+ {
+ nativeBuildInputs = [
+ finalAttrs.finalPackage
+ gradle_8.jdk
+ ];
+ src = ./2DShapes.ump;
+ }
+ ''
+ set -euo pipefail
+ cp $src .
+ umple $(basename $src)
+ javac -d bin Shapes/core/*.java
+ java -cp bin Shapes.core.Shape2D
+ touch $out
+ '';
+ };
+
+ meta = {
+ description = "Model-oriented programming language and modelling tool for integrating UML constructs into high-level languages";
+ mainProgram = "umple";
+ homepage = "https://github.com/umple/umple";
+ downloadPage = "https://github.com/umple/umple/releases";
+ license = lib.licenses.mit;
+ sourceProvenance = with lib.sourceTypes; [
+ fromSource
+ binaryBytecode
+ ];
+ maintainers = with lib.maintainers; [ MysteryBlokHed ];
+ };
+})
diff --git a/pkgs/by-name/um/umple/replace-version.patch b/pkgs/by-name/um/umple/replace-version.patch
new file mode 100644
index 000000000000..f376b15c2ec8
--- /dev/null
+++ b/pkgs/by-name/um/umple/replace-version.patch
@@ -0,0 +1,11 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -32,7 +32,7 @@ ext {
+ umpleMajorVersionFile = new File("${rootProject.projectDir.toString()}/build/umpleversion.txt")
+ umpleLastVersion = new org.yaml.snakeyaml.Yaml().load(rootProject.ext.umpleLastVersionFile.newInputStream()).version
+ umpleMajorVersion = new org.yaml.snakeyaml.Yaml().load(rootProject.ext.umpleMajorVersionFile.newInputStream()).version
+- umpleCurrentVersion = "${rootProject.ext.umpleMajorVersion}.${runGit(['rev-list', '--count', 'master'], 'x')}.${runGit(['rev-parse', '--short', 'master'], 'dev')}"
++ umpleCurrentVersion = "@UMPLE_VERSION@"
+ umpleCurrentJarBase = "umple-${rootProject.ext.umpleCurrentVersion}"
+ umpleCurrentJar = "${rootProject.projectDir.toString()}/dist/gradle/libs/${rootProject.ext.umpleCurrentJarBase}.jar"
+ umpleJarRemoteSource = "https://cruise.umple.org/umpleonline/scripts/umple.jar"
diff --git a/pkgs/by-name/um/umple/update.sh b/pkgs/by-name/um/umple/update.sh
new file mode 100755
index 000000000000..0ec6f3e14525
--- /dev/null
+++ b/pkgs/by-name/um/umple/update.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl git jq nix-update
+set -euo pipefail
+
+release=$(curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/umple/umple/releases/latest)
+latestTag=$(echo "$release" | jq -r '.tag_name')
+latestVersion="${latestTag#v}"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; umple.version or (lib.getVersion umple)" | tr -d '"')
+echo "Current version: $currentVersion"
+echo "Latest version: $latestVersion"
+
+if [[ "$currentVersion" = "$latestVersion" ]]; then
+ echo "Up-to-date."
+ exit
+fi
+
+echo "Updating to $latestVersion"
+
+location="$(dirname -- "${BASH_SOURCE[0]}")"
+
+# Get commit count and hash from upstream repository tag
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+
+pushd "$tmpdir"
+git clone --branch "$latestVersion" --single-branch https://github.com/umple/umple.git .
+revision=$(git rev-parse --short HEAD)
+commitCount=$(git rev-list --count HEAD)
+longVersion="$latestVersion.$commitCount.$revision"
+popd
+
+# Find the filename and hash of the latest stable Umple JAR for bootstrapping.
+# The best way to do this is to just check the prefix of release assets,
+# since the commit count + hash used don't match the release tag, for some reason.
+umpleName=$(echo "$release" | jq -r 'first(.assets[] | select(.name | startswith("umple-")) | .name)')
+if [[ -z "$umpleName" ]]; then
+ echo "Could not find Umple JAR in GitHub release assets."
+ exit 1
+fi
+
+umpleUrl="https://github.com/umple/umple/releases/download/$latestTag/$umpleName"
+umpleHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 \
+ "$(nix-prefetch-url "$umpleUrl")")
+
+# Save version info
+jq -n \
+ --arg version "$latestVersion" \
+ --arg longVersion "$longVersion" \
+ --arg revision "$revision" \
+ --arg commitCount "$commitCount" \
+ --arg umpleUrl "$umpleUrl" \
+ --arg umpleHash "$umpleHash" \
+ '{
+ "umple": {
+ "version": $version,
+ "longVersion": $longVersion,
+ "revision": $revision,
+ "commitCount": $commitCount
+ },
+ "umpleJar": {
+ "url": $umpleUrl,
+ "hash": $umpleHash
+ }
+ }' > "$location/versions.json"
+
+# Version update is done; use nix-update for hashes and Gradle deps
+nix-update umple --version=skip
diff --git a/pkgs/by-name/um/umple/versions.json b/pkgs/by-name/um/umple/versions.json
new file mode 100644
index 000000000000..9ca7502961c5
--- /dev/null
+++ b/pkgs/by-name/um/umple/versions.json
@@ -0,0 +1,12 @@
+{
+ "umple": {
+ "version": "1.37.0",
+ "longVersion": "1.37.0.8543.1593c2b83",
+ "revision": "1593c2b83",
+ "commitCount": "8543"
+ },
+ "umpleJar": {
+ "url": "https://github.com/umple/umple/releases/download/v1.37.0/umple-1.37.0.8542.3a8c87689.jar",
+ "hash": "sha256-pBHHbURbe7B5A11tShvHGlSO4XMJPcdM7Iy+ph3PxAE="
+ }
+}
diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index f88f17919e8c..18aa76fa911c 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "vacuum-tube";
- version = "1.7.3";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "shy1132";
repo = "VacuumTube";
tag = "v${version}";
- hash = "sha256-SHCfg8DVhhGwWR0qHzm3zKxsXPycRSJg5LDPTNKMiOY=";
+ hash = "sha256-LVsNCf0rvgWuyKEzt5b2AcwK6JdDe3ghiSOUXg7nSaA=";
};
- npmDepsHash = "sha256-IE8P7RblF6tpjQX4PrH2p4OnVq2MLwi+/7JzAcI9NvY=";
+ npmDepsHash = "sha256-hbSN5I3LG4+y0Ggkv5C1zsaLYbrFjGXiwURfc51d0Kk=";
makeCacheWritable = true;
env = {
diff --git a/pkgs/by-name/ve/veila/package.nix b/pkgs/by-name/ve/veila/package.nix
index 078f9bf36a0b..d56ea5fcfe96 100644
--- a/pkgs/by-name/ve/veila/package.nix
+++ b/pkgs/by-name/ve/veila/package.nix
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "veila";
- version = "0.4.2";
+ version = "0.4.3";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "naurissteins";
repo = "Veila";
tag = finalAttrs.version;
- hash = "sha256-4aweH5ckOGa7T0SiU+cHd4GA4m1Iw24BiJqbTSoMj08=";
+ hash = "sha256-6b8KODC62pL0ocgcGiO4P9cwVkomFen6tn3H7QilOhc=";
};
- cargoHash = "sha256-1vbnqiK7ourVJGgRi7lprPNNwuviDuf70cl69M1PZ7A=";
+ cargoHash = "sha256-zWGVDgnL2AjgO1gdx6Ye3DX5kmy+6nzQ9ZeMHE9l/NQ=";
nativeBuildInputs = [
makeWrapper
diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix
index 6c23462109d4..001c2c7c99f6 100644
--- a/pkgs/by-name/vi/vikunja-desktop/package.nix
+++ b/pkgs/by-name/vi/vikunja-desktop/package.nix
@@ -3,6 +3,7 @@
stdenv,
makeWrapper,
makeDesktopItem,
+ darwin,
pnpm_10_29_2,
pnpmConfigHook,
nodejs,
@@ -52,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
pnpm_10_29_2
pnpmConfigHook
vikunja.passthru.frontend
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.autoSignDarwinBinariesHook
];
buildPhase = ''
@@ -60,7 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
sed -i "s/\$${version}/${version}/g" package.json
sed -i "s/\"version\": \".*\"/\"version\": \"${version}\"/" package.json
ln -s '${vikunja.passthru.frontend}' frontend
- pnpm run pack -c.electronDist="${electron.dist}" -c.electronVersion="${electron.version}"
+
+ electronDist="${electron.dist}"
+ ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+ electronDist="$(mktemp -d)"
+ cp -R "${electron.dist}/." "$electronDist"
+ chmod -R u+w "$electronDist"
+ export CSC_IDENTITY_AUTO_DISCOVERY=false
+ ''}
+ pnpm run pack \
+ -c.electronDist="$electronDist" \
+ -c.electronVersion="${electron.version}" \
+ ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
runHook postBuild
'';
@@ -70,20 +85,30 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
- mkdir -p "$out/share/lib/vikunja-desktop"
- cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop"
- cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources"
+ ${lib.optionalString stdenv.hostPlatform.isLinux ''
+ mkdir -p "$out/share/lib/vikunja-desktop"
+ cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop"
+ cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources"
- install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png"
+ install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png"
- # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion
- # see https://github.com/NixOS/nixpkgs/issues/172583
- makeShellWrapper "${lib.getExe electron}" "$out/bin/vikunja-desktop" \
- --add-flags "$out/share/lib/vikunja-desktop/resources/app.asar" \
- "''${gappsWrapperArgs[@]}" \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \
- --set-default ELECTRON_IS_DEV 0 \
- --inherit-argv0
+ # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion
+ # see https://github.com/NixOS/nixpkgs/issues/172583
+ makeShellWrapper "${lib.getExe electron}" "$out/bin/vikunja-desktop" \
+ --add-flags "$out/share/lib/vikunja-desktop/resources/app.asar" \
+ "''${gappsWrapperArgs[@]}" \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \
+ --set-default ELECTRON_IS_DEV 0 \
+ --inherit-argv0
+ ''}
+
+ ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p "$out/Applications" "$out/bin"
+ mv ./dist/mac*/*.app "$out/Applications"
+ makeWrapper \
+ "$out/Applications/Vikunja Desktop.app/Contents/MacOS/Vikunja Desktop" \
+ "$out/bin/vikunja-desktop"
+ ''}
runHook postInstall
'';
diff --git a/pkgs/by-name/wa/wasmer/package.nix b/pkgs/by-name/wa/wasmer/package.nix
index 263cfc2a7422..3ed828198893 100644
--- a/pkgs/by-name/wa/wasmer/package.nix
+++ b/pkgs/by-name/wa/wasmer/package.nix
@@ -10,7 +10,7 @@
curl,
writeShellApplication,
installShellFiles,
- llvmPackages_21,
+ llvmPackages_22,
libffi,
libxml2,
fixDarwinDylibNames,
@@ -20,26 +20,26 @@
}:
let
- v8Version = "11.9.2";
+ v8Version = "11.9.7";
# Prebuilt V8 from wasmerio's custom builds, only evaluated when withV8 = true.
# Per-platform hashes, auto-updated via the general updateScript
v8Hashes = {
- "v8-linux-amd64.tar.xz" = "sha256-nTCVdBKtyVMb7lE+Db4RDsShKkLbG/0r980ejd+EAvo=";
- "v8-linux-musl-amd64.tar.xz" = "sha256-XgRs3I46B2PG7Jrv5E+KSeuNfXLhgB7R66cAkA/Bvv8=";
- "v8-darwin-arm64.tar.xz" = "sha256-xAG1PcAGw8a0A9k8d78/whTUXnqdfRZBz8yrg/+iz0M=";
+ "v8-linux-amd64.tar.xz" = "sha256-VOGZOKA07neIixDPJ3BLGeMX37/o9o16X4rYlo/nMbo=";
+ "v8-linux-musl.tar.xz" = "sha256-drD0YfCA56zej5PFR1olfdUMOOlgYo8LGbxWEJ1NusY=";
+ "v8-darwin-aarch64.tar.xz" = "sha256-Vk0ys6MjHSa8Gjd7XN0Jj4gyxORU0yP7hEmYk1ENeq4=";
};
v8Prebuilt =
let
assetName =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl then
- "v8-linux-musl-amd64.tar.xz"
+ "v8-linux-musl.tar.xz"
else if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"v8-linux-amd64.tar.xz"
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
- "v8-darwin-arm64.tar.xz"
+ "v8-darwin-aarch64.tar.xz"
else
throw "withV8 = true is not supported on ${stdenv.hostPlatform.system}";
in
@@ -61,7 +61,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "wasmer";
- version = "7.1.0";
+ version = "7.2.0";
__structuredAttrs = true;
strictDeps = true;
@@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: {
owner = "wasmerio";
repo = "wasmer";
tag = "v${finalAttrs.version}";
- hash = "sha256-A1SkZY+iSR9xlu6R1p9uZYsGFPAOifuYTHtEXaEgves=";
+ hash = "sha256-HiMxBABLkX0i5jGowZU7dWhW46hvtcvbX7rskL3i+iY=";
fetchSubmodules = true;
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-wBEwGKjj9DdZESFlXS8T7B0Xdp7yMe08DYTGr4wnTVI=";
+ hash = "sha256-+O/JbgozCHF/QBABMtxqkGFQYtAQwu6OUDoD5EZZmXs=";
};
nativeBuildInputs = [
@@ -89,42 +89,34 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals withLLVM [
- llvmPackages_21.llvm
+ llvmPackages_22.llvm
libffi
libxml2
];
postPatch =
- # In 7.1.0 there is no nice flag to toggle napi/v8 on or off,
- # so we manually delete the Makefile entry when we don't want v8
- # TODO: v7.2.0 pre-release has a flag, when updating to 7.2.0
- # add "ENABLE_NAPI_V8=${if withV8 then "1" else "0"}" to makeFlags
- lib.optionalString (!withV8) ''
- substituteInPlace Makefile \
- --replace-fail ' build_wasmer_extra_features += napi-v8' ""
- ''
- +
- lib.optionalString stdenv.hostPlatform.isDarwin
- # `install -Dm644 /dev/stdin DEST` fails on darwin with
- # "skipping file '/dev/stdin', as it was replaced while being copied".
- (
- ''
- substituteInPlace Makefile \
- --replace-fail 'echo "$$pc" | install -Dm644 /dev/stdin "$(DESTDIR)"/lib/pkgconfig/wasmer.pc;' \
- 'mkdir -p "$(DESTDIR)/lib/pkgconfig" && printf "%s\n" "$$pc" > "$(DESTDIR)/lib/pkgconfig/wasmer.pc";'
- ''
- # install-capi-lib hardcodes libwasmer.so and a Linux SONAME symlink chain
- # (also marked Linux only in the Makefile)
- + ''
- substituteInPlace Makefile \
- --replace-fail 'install-capi-lib ' ""
- ''
- );
+ lib.optionalString stdenv.hostPlatform.isDarwin
+ # `install -Dm644 /dev/stdin DEST` fails on darwin with
+ # "skipping file '/dev/stdin', as it was replaced while being copied".
+ (
+ ''
+ substituteInPlace Makefile \
+ --replace-fail 'echo "$$pc" | install -Dm644 /dev/stdin "$(DESTDIR)"/lib/pkgconfig/wasmer.pc;' \
+ 'mkdir -p "$(DESTDIR)/lib/pkgconfig" && printf "%s\n" "$$pc" > "$(DESTDIR)/lib/pkgconfig/wasmer.pc";'
+ ''
+ # install-capi-lib hardcodes libwasmer.so and a Linux SONAME symlink chain
+ # (also marked Linux only in the Makefile)
+ + ''
+ substituteInPlace Makefile \
+ --replace-fail 'install-capi-lib ' ""
+ ''
+ );
makeFlags = [
"WASMER_INSTALL_PREFIX=${placeholder "out"}"
"DESTDIR=${placeholder "out"}"
"ENABLE_LLVM=${if withLLVM then "1" else "0"}"
+ "ENABLE_NAPI_V8=${if withV8 then "1" else "0"}"
];
# Default all target includes headless C API which doesn't get installed
@@ -136,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
env =
lib.optionalAttrs withLLVM {
- LLVM_SYS_211_PREFIX = llvmPackages_21.llvm.dev;
+ LLVM_SYS_221_PREFIX = llvmPackages_22.llvm.dev;
}
// lib.optionalAttrs withV8 {
# build.rs skips the download when these are set; see resolve_explicit_v8 in lib/napi/build.rs
diff --git a/pkgs/by-name/wa/wasmer/update.sh b/pkgs/by-name/wa/wasmer/update.sh
index 7729a17c0a4b..ef789b9bf286 100644
--- a/pkgs/by-name/wa/wasmer/update.sh
+++ b/pkgs/by-name/wa/wasmer/update.sh
@@ -1,9 +1,20 @@
-old_version=$(grep -oP '^ version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix)
+set -euo pipefail
+
+pkg=pkgs/by-name/wa/wasmer/package.nix
+
+die() {
+ echo "update-wasmer: error: $*" >&2
+ exit 1
+}
+
+[ -f "$pkg" ] || die "cannot find $pkg (run from the nixpkgs root)"
+
+old_version=$(grep -oP '^ version = "\K[^"]+(?=";)' "$pkg")
echo "Current wasmer version: $old_version"
nix-update wasmer "$@"
-new_version=$(grep -oP '^ version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix)
+new_version=$(grep -oP '^ version = "\K[^"]+(?=";)' "$pkg")
if [ "$old_version" = "$new_version" ]; then
echo "Already at $old_version, nothing to do"
exit 0
@@ -14,10 +25,16 @@ echo "Updated wasmer $old_version -> $new_version"
# lib/napi is a submodule, so resolve its pinned SHA first, then fetch build.rs from that repo.
echo "Fetching PREBUILT_V8_VERSION from lib/napi/build.rs..."
napi_sha=$(curl -fsSL "https://api.github.com/repos/wasmerio/wasmer/contents/lib/napi?ref=v${new_version}" \
- | grep -oP '"sha":\s*"\K[^"]+' | head -1)
+ | grep -oP '"sha":\s*"\K[^"]+' | head -1) \
+ || die "failed to query lib/napi submodule SHA for v${new_version} (does the tag exist?)"
+[ -n "$napi_sha" ] || die "could not resolve lib/napi submodule SHA for v${new_version}"
+
new_v8=$(curl -fsSL "https://raw.githubusercontent.com/wasmerio/napi/${napi_sha}/build.rs" \
- | grep -oP 'PREBUILT_V8_VERSION\s*:\s*&str\s*=\s*"\K[^"]+')
-cur_v8=$(grep -oP '^ v8Version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix)
+ | grep -oP 'PREBUILT_V8_VERSION\s*:\s*&str\s*=\s*"\K[^"]+') \
+ || die "failed to fetch build.rs from wasmerio/napi@${napi_sha}"
+[ -n "$new_v8" ] || die "could not parse PREBUILT_V8_VERSION from wasmerio/napi@${napi_sha}/build.rs (format may have changed)"
+
+cur_v8=$(grep -oP '^ v8Version = "\K[^"]+(?=";)' "$pkg")
echo "V8: current=$cur_v8, required=$new_v8"
if [ "$new_v8" = "$cur_v8" ]; then
@@ -25,25 +42,35 @@ if [ "$new_v8" = "$cur_v8" ]; then
exit 0
fi
-echo "V8 bumped $cur_v8 -> $new_v8, fetching hashes for all platforms..."
-sed -i "s|^ v8Version = \"[^\"]*\";$| v8Version = \"$new_v8\";|" \
- pkgs/by-name/wa/wasmer/package.nix
+# The asset filenames live in the v8Hashes attrset (also referenced by the
+# assetName mapping below it). Treat package.nix as the single source of truth
+# so this list can never drift from what the derivation actually fetches.
+mapfile -t assets < <(grep -oP '^\s*"\Kv8-[^"]+\.tar\.xz(?=" = "sha256)' "$pkg")
+[ "${#assets[@]}" -gt 0 ] || die "found no v8 assets in the v8Hashes attrset of $pkg"
+
+echo "V8 bumped $cur_v8 -> $new_v8, fetching hashes for ${#assets[@]} platform(s)..."
+sed -i "s|^ v8Version = \"[^\"]*\";$| v8Version = \"$new_v8\";|" "$pkg"
base="https://github.com/wasmerio/v8-custom-builds/releases/download/$new_v8"
-declare -A assets=(
- ["v8-linux-amd64.tar.xz"]="$base/v8-linux-amd64.tar.xz"
- ["v8-linux-musl-amd64.tar.xz"]="$base/v8-linux-musl-amd64.tar.xz"
- ["v8-darwin-arm64.tar.xz"]="$base/v8-darwin-arm64.tar.xz"
-)
-
-for asset in "${!assets[@]}"; do
- url="${assets[$asset]}"
+for asset in "${assets[@]}"; do
+ url="$base/$asset"
echo " Fetching hash for $asset..."
- hash=$(nix-prefetch-url --type sha256 "$url" 2>/dev/null \
- | xargs nix hash convert --hash-algo sha256 --to sri)
+ # Do not suppress errors here: a 404 usually means upstream renamed the asset
+ # between releases (e.g. v8-darwin-arm64 -> v8-darwin-aarch64), in which case
+ # the asset key in package.nix must be updated by hand before this can work.
+ if ! raw=$(nix-prefetch-url --type sha256 "$url"); then
+ die "could not download $url
+ The asset may have been renamed in the $new_v8 release. Check
+ https://github.com/wasmerio/v8-custom-builds/releases/tag/$new_v8
+ and update the v8Hashes keys and the assetName mapping in $pkg to match,
+ then re-run this script."
+ fi
+ hash=$(nix hash convert --hash-algo sha256 --to sri "$raw") \
+ || die "failed to convert hash for $asset ($raw)"
echo " $asset -> $hash"
- sed -i "s|\"$asset\" = \"[^\"]*\"|\"$asset\" = \"$hash\"|" \
- pkgs/by-name/wa/wasmer/package.nix
+ sed -i "s|\"$asset\" = \"[^\"]*\"|\"$asset\" = \"$hash\"|" "$pkg"
+ grep -qF "\"$asset\" = \"$hash\"" "$pkg" \
+ || die "failed to write hash for $asset into $pkg (pattern did not match)"
done
echo "Done"
diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
index 877bba8f7c6d..eb0a1a257e85 100644
--- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
+++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "whatsapp-emoji-linux";
- version = "2.25.9.78-3";
+ version = "2.26.8.72-1";
src = fetchFromGitHub {
tag = version;
owner = "dmlls";
repo = "whatsapp-emoji-linux";
- hash = "sha256-IP8zWFttr7Osy8rrTLL0bTrdEMLvTNjuadZ2ksfTViw=";
+ hash = "sha256-72qqW68kmAqm2+Z5ldWMHEJL8LXpE93A32VsmW+dbY8=";
};
makeFlags = [
diff --git a/pkgs/by-name/wx/wxmaxima/package.nix b/pkgs/by-name/wx/wxmaxima/package.nix
index f26b0512c6d2..b2bf7cc85c54 100644
--- a/pkgs/by-name/wx/wxmaxima/package.nix
+++ b/pkgs/by-name/wx/wxmaxima/package.nix
@@ -6,24 +6,25 @@
cmake,
gettext,
maxima,
- wxwidgets_3_2,
+ # Supports also wxwidgets_3_2
+ wxwidgets_3_3,
adwaita-icon-theme,
glib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wxmaxima";
- version = "26.06.2";
+ version = "26.07.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${finalAttrs.version}";
- hash = "sha256-BehuFRofeU3k7hmdAM6b1gRuxQBhvonvPtTyW3gauV0=";
+ hash = "sha256-rrXYSW3PU4CvtmBH0dU/sBwe1sVel9IkI89HTj0YEqc=";
};
buildInputs = [
- wxwidgets_3_2
+ wxwidgets_3_3
maxima
# So it won't embed svg files into headers.
adwaita-icon-theme
@@ -38,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
- "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib"
+ "-DwxWidgets_LIBRARIES=${wxwidgets_3_3}/lib"
];
preConfigure = ''
diff --git a/pkgs/by-name/yo/youtubedr/package.nix b/pkgs/by-name/yo/youtubedr/package.nix
new file mode 100644
index 000000000000..cdb3023f698f
--- /dev/null
+++ b/pkgs/by-name/yo/youtubedr/package.nix
@@ -0,0 +1,70 @@
+{
+ lib,
+ buildGoModule,
+ versionCheckHook,
+ fetchFromGitHub,
+}:
+
+let
+ # Disabled because tests rely on network requests
+ disabledTests = [
+ "TestTranscript"
+ "TestSimpleTest"
+ "TestGetPlaylist"
+ "TestGetBigPlaylist"
+ "TestDownload_SensitiveContent"
+ "TestGetVideo_MultiLanguage"
+ "TestParseVideo"
+ "TestParse_PublishDate"
+ "TestDownload_WhenPlayabilityStatusIsNotOK"
+ "TestDownload_Regular"
+ "TestYoutube_GetItagInfo"
+ "TestClient_httpGetBodyBytes"
+ "TestClient_httpGetBodyBytes"
+ "TestGetStream"
+ "TestGetVideoWithManifestURL"
+ "TestWebClientGetVideoWithoutManifestURL"
+ "TestGetVideoWithoutManifestURL"
+ "TestClient_httpGetBodyBytes"
+ "TestDownload_FirstStream"
+ ];
+in
+buildGoModule (finalAttrs: {
+ pname = "youtubedr";
+ version = "2.10.6";
+
+ src = fetchFromGitHub {
+ owner = "kkdai";
+ repo = "youtube";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-rkkqLBH4P5DMrbfsZwVgBjnQG1/fHdjVL4mU6amYUxM=";
+ };
+
+ __structuredAttrs = true;
+
+ vendorHash = "sha256-DIdDDS8U4UR3ZPmwqrhsOfejUJ4UHmwcr4JCpjkwOzs=";
+
+ ldflags = [
+ "-X main.version=${finalAttrs.version}"
+ ];
+
+ checkFlags = [
+ "-skip=${lib.concatStringsSep "|" disabledTests}"
+ ];
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+
+ versionCheckProgramArg = "version";
+ versionCheckKeepEnvironment = [ "HOME" ];
+ doInstallCheck = true;
+
+ meta = {
+ homepage = "https://github.com/kkdai/youtube";
+ description = "YouTube video download CLI";
+ mainProgram = "youtubedr";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.ligerothetiger ];
+ };
+})
diff --git a/pkgs/by-name/ze/zed-wakatime-ls/package.nix b/pkgs/by-name/ze/zed-wakatime-ls/package.nix
new file mode 100644
index 000000000000..b0f77399e259
--- /dev/null
+++ b/pkgs/by-name/ze/zed-wakatime-ls/package.nix
@@ -0,0 +1,41 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "zed-wakatime-ls";
+ version = "0.1.10";
+
+ src = fetchFromGitHub {
+ owner = "wakatime";
+ repo = "zed-wakatime";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-Jmm+eRHMNBkc6ZzadvkWrfsb+bwEBNM0fnXU4dJ0NgE=";
+ };
+
+ buildAndTestSubdir = "wakatime-ls";
+
+ cargoHash = "sha256-x2axmHinxYZ2VEddeCTqMJd8ok0KgAVdUhbWaOdRA30=";
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+
+ __structuredAttrs = true;
+
+ meta = {
+ description = "WakaTime language server for Zed";
+ longDescription = ''
+ Usage: Add "zed-wakatime-ls" to programs.zed-editor.extraPackages in home-manager or globally
+ in home.packages or environment.systemPackages to allow the Zed WakaTime extension to find and
+ run the language server.
+ '';
+ homepage = "https://github.com/wakatime/zed-wakatime";
+ changelog = "https://github.com/wakatime/zed-wakatime/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ krishnans2006 ];
+ mainProgram = "wakatime-ls";
+ };
+})
diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
new file mode 100644
index 000000000000..1a43598fbd3a
--- /dev/null
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -0,0 +1,93 @@
+{
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+ makeDesktopItem,
+ copyDesktopItems,
+ electron_41,
+ makeBinaryWrapper,
+ nix-update-script,
+
+ installCli ? false,
+}:
+
+buildNpmPackage (finalAttrs: {
+ pname = "zennotes-desktop";
+ version = "2.3.0";
+ npmDepsHash = "sha256-7IpGnxVjaJvfSZyKjOylGMhFqa1bx8Ry5O1yqYfNnCE=";
+
+ src = fetchFromGitHub {
+ owner = "ZenNotes";
+ repo = "zennotes";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-+tLPVnnMbtMa5blSwHav9ZMlnkUsrdG62mMGxhbmy6g=";
+ };
+
+ npmWorkspace = "apps/desktop";
+
+ env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ nativeBuildInputs = [
+ makeBinaryWrapper
+ copyDesktopItems
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/lib/node_modules/zennotes-monorepo
+ cp -r . $out/lib/node_modules/zennotes-monorepo/
+
+ for icon in apps/desktop/build/icons/*.png; do
+ size="$(basename "$icon" .png)"
+ install -Dm644 $icon $out/share/icons/hicolor/$size/apps/zennotes-desktop.png
+ done
+
+ mkdir -p $out/bin
+ makeWrapper ${electron_41}/bin/electron $out/bin/zennotes-desktop \
+ --add-flags "$out/lib/node_modules/zennotes-monorepo/apps/desktop"
+
+ ${lib.optionalString installCli ''
+ makeWrapper ${electron_41}/libexec/electron/electron $out/bin/zen \
+ --set ELECTRON_RUN_AS_NODE 1 \
+ --add-flags "$out/lib/node_modules/zennotes-monorepo/apps/desktop/out/main/cli.js"
+ ''}
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "zennotes-desktop";
+ desktopName = "ZenNotes";
+ exec = "zennotes-desktop %U";
+ icon = "zennotes-desktop";
+ comment = "Keyboard-first local Markdown notes";
+ categories = [
+ "Office"
+ "Utility"
+ "TextEditor"
+ ];
+ startupWMClass = "ZenNotes";
+ mimeTypes = [
+ "text/markdown"
+ "x-scheme-handler/zennotes"
+ ];
+ })
+ ];
+
+ passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+ meta = {
+ description = "Keyboard-first local Markdown notes with Vim motions, diagrams, and MCP integration";
+ homepage = "https://zennotes.org/";
+ changelog = "https://github.com/ZenNotes/zennotes/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ justkrysteq ];
+ mainProgram = "zennotes-desktop";
+ platforms = lib.platforms.darwin ++ lib.platforms.linux;
+ };
+})
diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix
index da6af0b98537..2a8a22171ba5 100644
--- a/pkgs/development/python-modules/array-api-compat/default.nix
+++ b/pkgs/development/python-modules/array-api-compat/default.nix
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "array-api-compat";
- version = "1.13";
+ version = "1.14";
pyproject = true;
src = fetchFromGitHub {
owner = "data-apis";
repo = "array-api-compat";
tag = version;
- hash = "sha256-4ZoYtqkY/xPRyBP1xeMR80zMfwiaKtXX/3XzqiweCtc=";
+ hash = "sha256-Dhiq6GWxVm9BEeO81VSa3L644gp00LxFPJAliz8LbAE=";
};
build-system = [
diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix
index 4f1ea982051b..bf3460779315 100644
--- a/pkgs/development/python-modules/cashews/default.nix
+++ b/pkgs/development/python-modules/cashews/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "cashews";
- version = "7.4.4";
+ version = "7.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Krukov";
repo = "cashews";
tag = version;
- hash = "sha256-KYMKqTLXQR7/pgXCOgDb9F2pelw9uyjEeJAwhWuXEZ8=";
+ hash = "sha256-GQObsWTCAKuYCyHZVd1wDzhvyYK5Xw1z1QazLuAP3Jg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix
index 06ddce72862c..2c3f84bc2bc7 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/pkgs/development/python-modules/kazoo/default.nix
@@ -2,6 +2,11 @@
lib,
buildPythonPackage,
fetchPypi,
+
+ # optional dependencies
+ eventlet,
+ gevent,
+ pure-sasl,
}:
buildPythonPackage rec {
@@ -14,6 +19,17 @@ buildPythonPackage rec {
hash = "sha256-kFeWrk9MEr1OSukubl0BhDnmtWyM+7JIJTYuebIw2rE=";
};
+ optional-dependencies = {
+ eventlet = [ eventlet ];
+ gevent = [ gevent ];
+ sasl = [ pure-sasl ];
+ };
+
+ pythonImportsCheck = [
+ "kazoo"
+ "kazoo.client"
+ ];
+
# tests take a long time to run and leave threads hanging
doCheck = false;
diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index b541bd8ec9d6..968e52b49a00 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage (finalAttrs: {
pname = "langchain-anthropic";
- version = "1.4.6";
+ version = "1.4.8";
pyproject = true;
__structuredAttrs = true;
@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-anthropic==${finalAttrs.version}";
- hash = "sha256-X+YS+T9mG+H4I2vHDYBi3Eev6OaCMgi56nKHEewgEXg=";
+ hash = "sha256-MX+DhFEkRNZ3IEKMXFT61XR6hEx2WPdGGaA0b/KlPZE=";
};
sourceRoot = "${finalAttrs.src.name}/libs/partners/anthropic";
diff --git a/pkgs/development/python-modules/logic2-automation/default.nix b/pkgs/development/python-modules/logic2-automation/default.nix
new file mode 100644
index 000000000000..4ed3e086519b
--- /dev/null
+++ b/pkgs/development/python-modules/logic2-automation/default.nix
@@ -0,0 +1,53 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build
+ hatchling,
+
+ # dependencies
+ grpcio,
+ grpcio-tools,
+ protobuf,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "logic2-automation";
+ version = "1.0.11";
+
+ src = fetchFromGitHub {
+ owner = "saleae";
+ repo = "logic2-automation";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-e0UvRwUs+rKFF3ky8bnHV22ZA9sU+AoghcMui2pIzQ0=";
+ };
+
+ sourceRoot = "source/python";
+
+ preBuild = "./build.sh";
+
+ pyproject = true;
+
+ build-system = [
+ hatchling
+ ];
+
+ dependencies = [
+ grpcio
+ grpcio-tools
+ protobuf
+ ];
+
+ # Tests require the unfree saleae-logic-2 package, plus gRPC server which is not packaged, yet.
+ doCheck = false;
+
+ pythonImportsCheck = [ "saleae.automation" ];
+
+ meta = {
+ description = "Automation interface for Saleae Logic 2 software";
+ homepage = "https://github.com/saleae/logic2-automation";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ krishnans2006 ];
+ };
+})
diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix
index c333bece263e..c709ec5c7bdc 100644
--- a/pkgs/development/python-modules/mpl-typst/default.nix
+++ b/pkgs/development/python-modules/mpl-typst/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "mpl-typst";
- version = "0.2.1";
+ version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "daskol";
repo = "mpl-typst";
tag = "v${version}";
- hash = "sha256-lkO4BTo3duNAsppTjteeBuzgSJL/UnKVW2QXgrfVrqM=";
+ hash = "sha256-RVzovICoDqEnjq0HngSe4vLlPszSgkq1FF0/Jrnw34Y=";
};
postPatch = ''
@@ -53,14 +53,21 @@ buildPythonPackage rec {
"mpl_typst.as_default"
];
- disabledTests = [
- # runs typst and gets "error: failed to download package"
- "test_draw_path"
- "test_draw_image_lenna"
- "test_draw_image_spy"
- ];
-
- disabledTestPaths = lib.optional stdenv.hostPlatform.isDarwin [
+ disabledTestPaths = [
+ # These render generated Typst through the typst binary. The prologue
+ # imports @preview/based, so Typst attempts to download a package in the
+ # Nix sandbox.
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_path"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_path_clips_to_bbox"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_path_bbox_pixels"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_path_hatched_rect_pixels"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_path_hatched_rect_pixels_golden"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_text_colored"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_image_lenna"
+ "mpl_typst/backend_test.py::TestTypstRenderer::test_draw_image_spy"
+ "tests/regression/issue32_test.py::TestIssue32::test_reference"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
# fatal error when matplotlib creates a canvas
"mpl_typst/backend_test.py"
];
diff --git a/pkgs/development/python-modules/pure-sasl/default.nix b/pkgs/development/python-modules/pure-sasl/default.nix
index 6e76ecb7dd61..e7f339d0e9aa 100644
--- a/pkgs/development/python-modules/pure-sasl/default.nix
+++ b/pkgs/development/python-modules/pure-sasl/default.nix
@@ -2,7 +2,15 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+
+ # build system
+ setuptools,
+
+ # optional dependencies
pykerberos,
+
+ # test dependencies
+ mock,
pytestCheckHook,
six,
}:
@@ -10,7 +18,7 @@
buildPythonPackage rec {
pname = "pure-sasl";
version = "0.6.2";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "thobbs";
@@ -19,23 +27,29 @@ buildPythonPackage rec {
hash = "sha256-AHoZ3QZLr0JLE8+a2zkB06v2wRknxhgm/tcEPXaJX/U=";
};
- postPatch = ''
- substituteInPlace tests/unit/test_mechanism.py \
- --replace 'from mock import patch' 'from unittest.mock import patch'
- '';
+ build-system = [ setuptools ];
- pythonImportsCheck = [ "puresasl" ];
+ optional-dependencies = {
+ gssapi = [ pykerberos ];
+ };
+
+ pythonImportsCheck = [
+ "puresasl"
+ "puresasl.client"
+ "puresasl.mechanisms"
+ ];
nativeCheckInputs = [
- pykerberos
+ mock
pytestCheckHook
six
- ];
+ ]
+ ++ lib.concatAttrValues optional-dependencies;
meta = {
description = "Reasonably high-level SASL client written in pure Python";
homepage = "http://github.com/thobbs/pure-sasl";
- changelog = "https://github.com/thobbs/pure-sasl/blob/0.6.2/CHANGES.rst";
+ changelog = "https://github.com/thobbs/pure-sasl/blob/${src.tag}/CHANGES.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jherland ];
};
diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix
index 0a1bd012c8f7..f8023ecc2851 100644
--- a/pkgs/development/python-modules/pyglossary/default.nix
+++ b/pkgs/development/python-modules/pyglossary/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage (finalAttrs: {
pname = "pyglossary";
- version = "5.4.1";
+ version = "5.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ilius";
repo = "pyglossary";
tag = finalAttrs.version;
- hash = "sha256-R0+iPcEuiSWaPecyo1Qf2kFWWzmE7xnZg2ZgFOPWCTU=";
+ hash = "sha256-Q2QS/Kg4iN1WMFTADfoqN9UC9da/5Bcp7ZjiZ5V3InM=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pysail/default.nix b/pkgs/development/python-modules/pysail/default.nix
new file mode 100644
index 000000000000..624c066ca517
--- /dev/null
+++ b/pkgs/development/python-modules/pysail/default.nix
@@ -0,0 +1,73 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+ testers,
+ pysail,
+
+ protoc,
+ protobuf,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "pysail";
+ version = "0.6.4";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "lakehq";
+ repo = "sail";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-EX8cDed32uF7NSreViKBn7RQeWIG7C7sI6O0c+hVf4M=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoVendor {
+ inherit (finalAttrs) pname src version;
+ hash = "sha256-ouNXKPpwKTLfI+Gcp393r7oHZAjUFQL9225+AuFzdoo=";
+ };
+
+ # The `generate-import-lib` PyO3 feature only matters when building Windows
+ # import libraries; on other platforms it just pulls in the `python3-dll-a`
+ # crate, which is not vendored. Drop it so the offline maturin build resolves.
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail '"pyo3/generate-import-lib",' ""
+ '';
+
+ nativeBuildInputs = with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ protoc
+ ];
+
+ buildInputs = [
+ protobuf
+ ];
+
+ pythonImportsCheck = [
+ "pysail"
+ "pysail._native"
+ ];
+
+ # The test suite requires a running Spark Connect server and many
+ # heavyweight optional dependencies (pyspark-client, duckdb, ...).
+ doCheck = false;
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion {
+ package = pysail;
+ };
+ };
+
+ meta = {
+ description = "Python bindings for Sail, a Spark-compatible compute engine on Apache Arrow and DataFusion";
+ homepage = "https://github.com/lakehq/sail";
+ changelog = "https://github.com/lakehq/sail/blob/${finalAttrs.src.tag}/docs/reference/changelog/index.md";
+ license = lib.licenses.asl20;
+ mainProgram = "sail";
+ maintainers = [ lib.maintainers.davidlghellin ];
+ };
+})
diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix
index cefb105097a4..a55a6917be78 100644
--- a/pkgs/development/python-modules/swh-shard/default.nix
+++ b/pkgs/development/python-modules/swh-shard/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage (finalAttrs: {
pname = "swh-shard";
- version = "2.2.0";
+ version = "2.2.1";
pyproject = true;
src = fetchFromGitLab {
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
owner = "devel";
repo = "swh-shard";
tag = "v${finalAttrs.version}";
- hash = "sha256-97oZ+Wa8GmyL2V4CnlSvaTbQZJ+mPbg6uVmWd0oxv1Q=";
+ hash = "sha256-acspStM+ohWDSqLH/aapWkI/VqAXnJCqeLTJ+lBlDcE=";
};
build-system = [
diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix
index 37f854fb5cd9..ebbc6b7db7a2 100644
--- a/pkgs/development/web/nodejs/update.nix
+++ b/pkgs/development/web/nodejs/update.nix
@@ -13,10 +13,10 @@
}:
let
- rev = "7b6eb2d6ab524bb30487f31612cdbeb35ae37533"; # should be the HEAD of nodejs/release-keys
+ rev = "890d535527789c9ebccdccdafd708f60dbd56786"; # should be the HEAD of nodejs/release-keys
pubring = fetchurl {
url = "https://github.com/nodejs/release-keys/raw/${rev}/gpg-only-active-keys/pubring.kbx";
- hash = "sha256-cNpMrJ0Eh8F3bGZAPV9v55mR8bo0+ulkFgN94ZUBl+E=";
+ hash = "sha256-jm+JUhoGlORF9C3s0CL0g2nGNPG1vLWXUTW2nIhimug=";
};
in
writeScript "update-nodejs" ''
diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
index c5a9fba9f302..a206536768d7 100644
--- a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "bm1549";
domain = "frigidaire";
- version = "0.1.21";
+ version = "0.1.22";
src = fetchFromGitHub {
inherit owner;
repo = "home-assistant-frigidaire";
tag = version;
- hash = "sha256-Pa1pVxP1gB/1XNqFy3U5t2xeHk+BUe6TQKtU00xcbx4=";
+ hash = "sha256-ASxedLzRP/+FkRDojXsXlvrvA18BzjGfsw0xoDnVaQA=";
};
dependencies = [ frigidaire ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bebf60d32af3..afb36d50ba82 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1941,6 +1941,7 @@ mapAliases {
quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14
qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
+ r0vm = throw "'r0vm' has been removed as the binary is provided by 'cargo-risczero'"; # Added 2026-03-25
ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27
rabbit = throw "'rabbit' has been renamed to/replaced by 'rabbit-ng'"; # Added 2026-02-18
radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be441ef8c348..c76e2cdb6f67 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9579,6 +9579,8 @@ self: super: with self; {
logging-tree = callPackage ../development/python-modules/logging-tree { };
+ logic2-automation = callPackage ../development/python-modules/logic2-automation { };
+
logical-unification = callPackage ../development/python-modules/logical-unification { };
logilab-common = callPackage ../development/python-modules/logilab/common.nix {
@@ -15362,6 +15364,10 @@ self: super: with self; {
pysabnzbd = callPackage ../development/python-modules/pysabnzbd { };
+ pysail = callPackage ../development/python-modules/pysail {
+ protoc = pkgs.protobuf;
+ };
+
pysaj = callPackage ../development/python-modules/pysaj { };
pysam = callPackage ../development/python-modules/pysam { };