Merge release-26.05 into staging-nixos-26.05

This commit is contained in:
nixpkgs-ci[bot] 2026-06-13 00:56:33 +00:00 committed by GitHub
commit 5959bc64c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 1504 additions and 410 deletions

View file

@ -9,9 +9,9 @@
},
"branch": "nixpkgs-unstable",
"submodules": false,
"revision": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
"url": "https://github.com/NixOS/nixpkgs/archive/cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73.tar.gz",
"hash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA="
"revision": "8c91a71d13451abc40eb9dae8910f972f979852f",
"url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz",
"hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE="
},
"treefmt-nix": {
"type": "Git",

View file

@ -370,12 +370,16 @@ in
"sleep.target"
];
script = "${lib.getExe cfg.package} data scrub ${fs}";
serviceConfig = {
Type = "oneshot";
Nice = 19;
IOSchedulingClass = "idle";
ExecStart = lib.join " " [
(lib.getExe cfg.package)
(if lib.versionOlder cfg.package.version "v1.34.0" then "data scrub" else "scrub")
(utils.escapeSystemdExecArg fs)
];
};
};
in

View file

@ -89,12 +89,17 @@
else
"nixos-firewall-tool open tcp 80";
reset = if backend == "firewalld" then "firewall-cmd --reload" else "nixos-firewall-tool reset";
# https://github.com/firewalld/firewalld/issues/1571
waitForFirewalld = lib.optionalString (backend == "firewalld") ''
walled.wait_until_succeeds("firewall-cmd --state")
'';
in
''
start_all()
walled.wait_for_unit("${unit}")
walled.wait_for_unit("httpd")
${waitForFirewalld}
attacker.wait_for_unit("network.target")
# Local connections should still work.

View file

@ -29,6 +29,8 @@
walled.wait_for_unit("firewalld")
walled.wait_for_unit("httpd")
# https://github.com/firewalld/firewalld/issues/1571
walled.wait_until_succeeds("firewall-cmd --state")
open.wait_for_unit("network.target")

View file

@ -1,10 +1,10 @@
{
"chromium": {
"version": "149.0.7827.102",
"version": "149.0.7827.114",
"chromedriver": {
"version": "149.0.7827.103",
"hash_darwin": "sha256-3ws6RyF5SwjRcdo4IY+MzqcaZ6214dCVV3YB4YL+h6k=",
"hash_darwin_aarch64": "sha256-S8/dGAlipcYXzZIEJEGAnvsu3ilqjnBb8IdXUxGrp2o="
"version": "149.0.7827.115",
"hash_darwin": "sha256-DOhM1knKphvLNyrkf0uvb9NZ3kBwSuVN5hkQLqAZR1Y=",
"hash_darwin_aarch64": "sha256-HXWvAjMdMMbeF8DsgFKNM+S0ZEYr2M8Wj0uUZC7tmxY="
},
"deps": {
"depot_tools": {
@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "112f665d98a2fe84b156c74fbea2aed742f16c15",
"hash": "sha256-75PYsss5Qob493WCc28XHncjFIlvUr2HQx79w5UmK/k=",
"rev": "5be7af702aa73ed64f47858cecc86290e42f2a20",
"hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=",
"recompress": true
},
"src/third_party/clang-format/script": {
@ -823,7 +823,7 @@
}
},
"ungoogled-chromium": {
"version": "149.0.7827.53",
"version": "149.0.7827.114",
"deps": {
"depot_tools": {
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
@ -835,16 +835,16 @@
"hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04="
},
"ungoogled-patches": {
"rev": "149.0.7827.53-1",
"hash": "sha256-j4maEZiU38tqs57cTmg8OhIAAQcT+liWU0fDA7GMZHM="
"rev": "149.0.7827.114-1",
"hash": "sha256-F0pIlZM/EBPLIZxD8jyLX7HWe0vFn2HXs2vkM5+Xplg="
},
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "9d2c8156a72129edca4785abb98866fad60ea338",
"hash": "sha256-RPFeHTWAeJUzbWU7QyRPmT3sqf3bAEuJ7/IJ3TP40pA=",
"rev": "5be7af702aa73ed64f47858cecc86290e42f2a20",
"hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=",
"recompress": true
},
"src/third_party/clang-format/script": {
@ -914,8 +914,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "ded782bca9d5f165d1c4a70124cdc5384043a8b3",
"hash": "sha256-7+Hhx/V554hO3zzGuIZswkaRVDElz7ost7vbnf2wyZc="
"rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642",
"hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@ -954,8 +954,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "1815a06195d9c74ac737a96f87c05111926e04f8",
"hash": "sha256-71KbW0w60VB67+HM48WpOo18hrVId4/4QBDl+xl5pgo="
"rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf",
"hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@ -1374,8 +1374,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
"rev": "a7849e8a5e9c996bef2332efae897e7301055a20",
"hash": "sha256-ftOTwWULKNplqjQQ9oM9t+PU3S6/ySDOBoE5E/HWuHg="
"rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8",
"hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@ -1429,8 +1429,8 @@
},
"src/third_party/perfetto": {
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
"rev": "846203c4b3b25f834a0bebc101fa8e1b8f9d0ca9",
"hash": "sha256-YOgOau9vNrOOqyUf6WylI/oQ2drCxoW7jnrHt7fAfQM="
"rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f",
"hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@ -1474,8 +1474,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "53348aa333da02b77c4b5797e2de722f5abde7d0",
"hash": "sha256-Qh0ytA45zP67VQE417iUtjPcJmJmDzcu4BAatyh6p0w="
"rev": "92a56ebeef43061f4878aa869aa1f2160265c24c",
"hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@ -1609,8 +1609,8 @@
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "5a7e0ff57a52e12f834d64c57d040d1105ea17f2",
"hash": "sha256-V1accCSU6LV5Ixhd+HBOvqZ7GxT57ALsvaF8ABLIXxM="
"rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e",
"hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@ -1639,8 +1639,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "5a39b146dd810a52812202fae891281d5dc4db7d",
"hash": "sha256-UbX88nE4VyWUm4PvFTOy3mC04MzSdgC006ZpQrEY8cQ="
"rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31",
"hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI="
}
}
}

View file

@ -16,4 +16,3 @@ treat_warnings_as_errors=false
use_official_google_api_keys=false
use_unofficial_version_number=false
v8_drumbrake_bounds_checks=true
v8_enable_drumbrake=true

View file

@ -123,10 +123,6 @@ fi
init_remote(){
local url=$1
clean_git init --initial-branch=master
# Disable maintenance: it's not useful for a short-lived clone, and
# background maintenance causes non-deterministic builds.
# https://github.com/NixOS/nixpkgs/issues/524215
clean_git config maintenance.auto false
clean_git remote add origin "$url"
if [ -n "$sparseCheckout" ]; then
git config remote.origin.partialclonefilter "blob:none"
@ -518,6 +514,15 @@ HOME="$tmpHomePath"
unset XDG_CONFIG_HOME
export GIT_CONFIG_NOSYSTEM=1
# Disable maintenance: it's not useful for a short-lived clone, and
# background maintenance causes non-deterministic builds.
# https://github.com/NixOS/nixpkgs/issues/524215
export GIT_CONFIG_COUNT=$(( ${GIT_CONFIG_COUNT:-0} + 1 ))
# Not the best but generic enough that it will work with `impureEnvVars`
export "GIT_CONFIG_KEY_$(( GIT_CONFIG_COUNT - 1 ))=maintenance.auto"
export "GIT_CONFIG_VALUE_$(( GIT_CONFIG_COUNT - 1 ))=false"
if test -n "$builder"; then
test -n "$out" -a -n "$url" -a -n "$rev" || usage
if test -n "$rootDir"; then

View file

@ -3,33 +3,34 @@
stdenv,
fetchFromGitHub,
meson,
pkg-config,
ninja,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aml";
version = "0.3.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "any1";
repo = "aml";
tag = "v${finalAttrs.version}";
sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
hash = "sha256-10gm6YphZrpLShj3NUj/AG24dSVLZAZbbnXr7GiF4DI=";
};
nativeBuildInputs = [
meson
pkg-config
ninja
];
strictDeps = true;
__structuredAttrs = true;
meta = {
description = "Another main loop";
inherit (finalAttrs.src.meta) homepage;
description = "Andri's Main Loop";
homepage = "https://github.com/any1/aml";
license = lib.licenses.isc;
platforms = lib.platforms.unix;
maintainers = [ ];
broken = stdenv.hostPlatform.isDarwin;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ nickcao ];
};
})

View file

@ -3,21 +3,27 @@
stdenv,
fetchFromGitLab,
cmake,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "arpa2cm";
version = "1.0.4";
version = "1.0.7";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitLab {
owner = "arpa2";
repo = "arpa2cm";
rev = "v${finalAttrs.version}";
hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
tag = "v${finalAttrs.version}";
hash = "sha256-JkMZUXqmrVzURVi8BJRsHprD4Jz6l83qhPxnOfq4KE4=";
};
nativeBuildInputs = [ cmake ];
passthru.updateScript = nix-update-script { };
meta = {
description = "CMake Module library for the ARPA2 project";
longDescription = ''
@ -33,8 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://gitlab.com/arpa2/arpa2cm";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [
fufexan
];
maintainers = with lib.maintainers; [ fufexan ];
teams = [ lib.teams.ngi ];
};
})

View file

@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack";
version = "26.05";
version = "26.05.1";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = "bookstack";
tag = "v${finalAttrs.version}";
hash = "sha256-hiq3cM5TpxlwyJwqEYQ1k+zUXsP23vsAb9OMXdXwCZA=";
hash = "sha256-g68wTZ5jRwXEKvAF9nLfKfWGf1FDD15msSkXzzJkVDQ=";
};
vendorHash = "sha256-/L2QAc8ezz1cW7a847A7wGPk0DCHrFbnuj2J6KmFS/E=";
vendorHash = "sha256-YJwJp+OtrCDgGFsZAjdlSx0LoxQFbylqCNW90MF8Kzo=";
passthru = {
phpPackage = php83;

View file

@ -0,0 +1,13 @@
diff --git a/src/LzFind.c b/src/LzFind.c
index 98d0ac6..f1bee55 100755
--- a/src/LzFind.c
+++ b/src/LzFind.c
@@ -229,7 +229,7 @@ static unsigned short * GetMatches2(UInt32 lenLimit, UInt32 curMatch, UInt32 pos
const unsigned char* _min = min;
unsigned cnt = 0;
if (_min < pb - (rle_len - len)) {_min = pb - (rle_len - len);}
- while (rle_pos > _min && *(uint64_t*)(rle_pos - 8) == starter_full) {rle_pos-=8; cnt+=8;}
+ while (rle_pos > _min && *(__typeof__(const uint64_t __attribute__((aligned(1))))*)(rle_pos - 8) == starter_full) {rle_pos-=8; cnt+=8;}
if (cnt) {
if (cnt + len > rle_len - 1) {cnt = rle_len - 1 - len;}
curMatch_rle -= cnt;

View file

@ -22,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
patches = [
# from https://github.com/fhanau/Efficient-Compression-Tool/issues/145
./ect-gcc-15-O3-fix.patch
];
# devendor libpng
postPatch = ''
substituteInPlace src/CMakeLists.txt \

View file

@ -10,20 +10,20 @@
let
pname = "electron-mail";
version = "5.3.6";
version = "5.3.7";
sources = {
x86_64-linux = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
hash = "sha256-3BWrVMlSUMMmuj6EAmqVtlHGCcminuVHkyPnc3TvgpM=";
hash = "sha256-VJbCQ/4yIuBE4NPDFUbp8t2G/QjUclphH/MghvamDVo=";
};
aarch64-darwin = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
hash = "sha256-z7j5WrU1F+iX8UDLWS5sXLwHjobPKJZFKXTcHTOQ/Eo=";
hash = "sha256-ulB+dlp6ZBhcBJiLY4k+E/oEWy9XSIuIzd5rTzEq9+4=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
hash = "sha256-7i0p7mBkzViXGdUrHXTrDDGdIy81p2YIei5Qsk8G5GU=";
hash = "sha256-LbAqUj34m8qSq8sQ1xgCQj9+MfJHoFDRMq+/waMKtzM=";
};
};

View file

@ -0,0 +1,19 @@
--- a/src/firewall-applet.in
+++ b/src/firewall-applet.in
@@ -59,14 +59,8 @@
NM_CONNECTION_EDITOR = ""
for binary in [
- "/usr/bin/systemsettings",
- "/bin/systemsettings",
- "/usr/bin/nm-connection-editor",
- "/bin/nm-connection-editor",
- "/usr/bin/kde5-nm-connection-editor",
- "/bin/kde5-nm-connection-editor",
- "/usr/bin/kde-nm-connection-editor",
- "/bin/kde-nm-connection-editor",
+ "/run/current-system/sw/bin/systemsettings",
+ "/run/current-system/sw/bin/nm-connection-editor",
]:
if os.path.exists(binary):
NM_CONNECTION_EDITOR = binary

View file

@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
autoconf,
automake,
docbook_xml_dtd_42,
@ -13,14 +12,12 @@
intltool,
ipset,
iptables,
kdePackages,
kmod,
libnotify,
librsvg,
libxml2,
libxslt,
networkmanager,
networkmanagerapplet,
pkg-config,
python3,
qt6,
@ -46,13 +43,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "firewalld";
version = "2.4.0";
version = "2.4.2";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "firewalld";
repo = "firewalld";
rev = "v${finalAttrs.version}";
sha256 = "sha256-P48qdgvcF3BQZ5h+HaylHb70ECa2bmEvYiAi9CeH0qs=";
tag = "v${finalAttrs.version}";
hash = "sha256-RUDDUvpGfWEKI+VtC4SBMLKsAHkStV1qAYpHLQbN5HM=";
};
patches = [
@ -61,28 +61,17 @@ stdenv.mkDerivation (finalAttrs: {
./specify-localedir.patch
./gettext-0.25.patch
# CVE-2026-4948: https://github.com/NixOS/nixpkgs/issues/505280
(fetchpatch2 {
url = "https://github.com/Prince213/firewalld/commit/e621b4b54be7cd8d77ce549ec17c6f814f9bd337.patch?full_index=1";
hash = "sha256-8auXNPVYnNk1UI0jM82IEQrMBhG189/I+DbaXt0VEhc=";
})
];
]
++ lib.optional withGui ./nm-connection-editor.patch;
postPatch = ''
substituteInPlace config/xmlschema/check.sh \
--replace-fail /usr/bin/ ""
for file in src/{firewall-offline-cmd.in,firewall/config/__init__.py.in} \
config/firewall-{applet,config}.desktop.in; do
for file in src/{firewall-offline-cmd.in,firewall/config/__init__.py.in}; do
substituteInPlace $file \
--replace-fail /usr "$out"
done
''
+ lib.optionalString withGui ''
substituteInPlace src/firewall-applet.in \
--replace-fail "/usr/bin/systemsettings" "${kdePackages.systemsettings}/bin/systemsettings" \
--replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
'';
nativeBuildInputs = [
@ -162,8 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru.tests = {
firewalld = nixosTests.firewalld;
firewall-firewalld = nixosTests.firewall-firewalld;
inherit (nixosTests) firewalld firewall-firewalld;
};
meta = {

View file

@ -26,26 +26,26 @@
sqlite,
xdg-desktop-portal,
libseccomp,
libglycin,
libglycin-gtk4,
glycin-loaders,
libwebp,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fractal";
version = "13";
version = "14";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "fractal";
tag = finalAttrs.version;
hash = "sha256-zIB04OIhMSm6OWHalnLO9Ng87dsvsmYurrro3hKwoYU=";
hash = "sha256-pgu+O9fRyZiRYkxRTlPgnd5jaGPL1nN0agMR+x6+oGg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-5wI74sKytewbRs0T/IQZFEaRTgJcF6HyDEK0mpjy0LU=";
hash = "sha256-Fsw0hIAYiF+31PNuC5a9SatRatY7A8OwABhlyHIl1Lc=";
};
patches = [
@ -58,13 +58,14 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace src/meson.build --replace-fail \
"target_dir / rust_target / meson.project_name()" \
"target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
patchShebangs ./build-aux/compile-blueprints.sh
'';
nativeBuildInputs = [
glib
grass-sass
gtk4
libglycin.patchVendorHook
meson
ninja
pkg-config
@ -80,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
glib
libglycin.setupHook
glycin-loaders
gtk4
gtksourceview5
lcms2
libadwaita
libglycin-gtk4
openssl
pipewire
libshumate

View file

@ -5,19 +5,20 @@
nodejs,
faketty,
openssl,
prisma_6,
prisma-engines_6,
prisma_7,
prisma-engines_7,
runtimeShell,
}:
buildNpmPackage rec {
buildNpmPackage (finalAttrs: {
pname = "ghostfolio";
version = "2.254.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-bcUr0tzq/X2pOmg7ZYj46+TQO9NBKmevm+C6PbyV/yc=";
tag = finalAttrs.version;
hash = "sha256-74CqCDyLrn3//FiTfo6xR5jLyo4jU+daBF9ES/uQE3E=";
# 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;
@ -27,10 +28,21 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-Wa15OSsd2IXTO1OjZoiFsSF0UhrzvS6fsymvxyPm0s8=";
npmDepsHash = "sha256-klWmB6LYf6h1WPi3AasDrdVdaPCyb5ePWuO9zqMcXys=";
postPatch = ''
substituteInPlace replace.build.mjs \
--replace-fail 'new Date()' "new Date(''$(<SOURCE_DATE_EPOCH))"
# SyntaxError: Named export 'PrismaClient' not found
substituteInPlace prisma/seed.mts \
--replace-fail "import { PrismaClient } from '@prisma/client';" \
"import prismaClientPkg from '@prisma/client'; const { PrismaClient } = prismaClientPkg;"
# storybook output is not used, skip it
substituteInPlace package.json --replace-fail "nx run ui:build-storybook" "true"
'';
nativeBuildInputs = [
prisma_6
prisma_7
faketty
];
@ -42,14 +54,10 @@ buildNpmPackage rec {
prisma generate
substituteInPlace replace.build.mjs \
--replace-fail 'new Date()' "new Date(''$(<SOURCE_DATE_EPOCH))"
# Workaround for https://github.com/nrwl/nx/issues/22445
faketty npm run build:production
cp -r node_modules dist/apps/api/
cp -r prisma dist/apps/api/
npm prune --omit=dev --no-save
runHook postBuild
'';
@ -57,33 +65,66 @@ buildNpmPackage rec {
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/node_modules/ghostfolio"
cp -r dist/apps/{api,client} "$out/lib/node_modules/ghostfolio/"
cp -r {node_modules,prisma} dist/apps/api/
mkdir -p $out/lib/ghostfolio
cp -r dist/apps/{api,client} "$out/lib/ghostfolio/"
substituteInPlace .config/prisma.ts \
--replace-fail "__dirname, '..', 'prisma'" "'$out/lib/ghostfolio/api/prisma'" \
--replace-fail "node " "${lib.getExe nodejs} "
install -Dm444 .config/prisma.ts "$out/lib/ghostfolio/api/prisma.config.ts"
mkdir "$out/bin"
makeWrapper ${lib.getExe nodejs} "$out/bin/ghostfolio" \
--add-flags "$out/lib/node_modules/ghostfolio/api/main" "''${user_args[@]}" \
--add-flags "$out/lib/ghostfolio/api/main" "''${user_args[@]}" \
--prefix PATH : ${lib.makeBinPath [ openssl ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} \
${lib.concatStringsSep " " (
lib.mapAttrsToList (name: value: "--set ${name} ${lib.escapeShellArg value}") {
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_6 "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_7 "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_7 "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_7}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_7 "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_7 "prisma-fmt";
}
)}
cat > $out/bin/ghostfolio-migrate <<EOF
#!${runtimeShell}
set -euo pipefail
${lib.getExe prisma_7} migrate deploy --config "$out/lib/ghostfolio/api/prisma.config.ts"
${lib.getExe prisma_7} db seed --config "$out/lib/ghostfolio/api/prisma.config.ts"
EOF
chmod +x $out/bin/ghostfolio-migrate
# For compatibility
mkdir -p $out/lib/node_modules
ln -sr $out/lib/ghostfolio $out/lib/node_modules/ghostfolio
runHook postInstall
'';
# Remove dev deps not needed at runtime
preFixup = ''
find $out/lib -name "*.py" -delete
apiModules="$out/lib/ghostfolio/api/node_modules"
rm -rf \
"$out/lib/ghostfolio/client/development" \
"$apiModules"/sass-embedded* \
"$apiModules"/{@,}esbuild \
"$apiModules"/{@,}rollup \
"$apiModules"/@rolldown \
"$apiModules"/@parcel/watcher-* \
"$apiModules"/typescript \
"$apiModules"/.{bin,cache} \
'';
meta = {
description = "Open Source Wealth Management Software";
homepage = "https://github.com/ghostfolio/ghostfolio";
changelog = "https://github.com/ghostfolio/ghostfolio/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/ghostfolio/ghostfolio/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "ghostfolio";
};
}
})

View file

@ -7,7 +7,7 @@
}:
let
version = "18.11.4";
version = "18.11.5";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -21,7 +21,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-YQpNsSCjcMC1tpwLVN0fCB9T3vBFxp0TyrvxzJfTnFg=";
hash = "sha256-i2DgcNoGPR/B6qya+jYFU5noOSabSlwu9P7p5KwR6jI=";
};
vendorHash = "sha256-/RJnCcmUoqGy08MSGEVM/taV1qZK65kiZw19n6S3ZQ0=";

View file

@ -6,14 +6,14 @@
buildGoModule (finalAttrs: {
pname = "gitlab-pages";
version = "18.11.4";
version = "18.11.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${finalAttrs.version}";
hash = "sha256-tE2PHWk12S482TjNhI0u7Afm0mPAgJWqcJiU5dgqN60=";
hash = "sha256-jSTXLbzYCiCpqrbs9kAmW6um2X5hA1OFiA6fSZrQ2RI=";
};
vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";

View file

@ -1,17 +1,17 @@
{
"version": "18.11.4",
"repo_hash": "sha256-ThtRXdUreorOIea5Izd+zKb88cC4nhitkzqT+Yf5UtU=",
"yarn_hash": "sha256-k8JHi0f/XfSV4kICyPW01Erk3YnKw33yeUWYrOaPdTM=",
"version": "18.11.5",
"repo_hash": "sha256-/RIUqxfRjq3+TOvapYMfl0uVqQLp1adpE6bR303rH6g=",
"yarn_hash": "sha256-og09R28lwYvDk4pe7z1dRMaanYiTsUSx+SUKoWc53do=",
"frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.11.4-ee",
"rev": "v18.11.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.11.4",
"GITLAB_KAS_VERSION": "18.11.4",
"GITLAB_PAGES_VERSION": "18.11.4",
"GITALY_SERVER_VERSION": "18.11.5",
"GITLAB_KAS_VERSION": "18.11.5",
"GITLAB_PAGES_VERSION": "18.11.5",
"GITLAB_SHELL_VERSION": "14.50.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.7",
"GITLAB_WORKHORSE_VERSION": "18.11.4"
"GITLAB_WORKHORSE_VERSION": "18.11.5"
}
}

View file

@ -10,7 +10,7 @@ in
buildGoModule (finalAttrs: {
pname = "gitlab-workhorse";
version = "18.11.4";
version = "18.11.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

View file

@ -117,7 +117,7 @@ gem 'openid_connect', '~> 2.3.0', feature_category: :system_access
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access
gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access
gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access
gem 'jwt', '~> 2.10.0', feature_category: :system_access
gem 'jwt', '~> 2.10.3', feature_category: :system_access
# Kerberos authentication. EE-only
gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access
@ -702,7 +702,7 @@ gem 'valid_email', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/Mi
gem 'jsonb_accessor', '~> 1.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'json', '~> 2.19.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'json_schemer', '~> 2.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'oj', '~> 3.16.0', '>=3.16.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'oj', '~> 3.17.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'oj-introspect', '~> 0.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'multi_json', '~> 1.17.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -768,3 +768,6 @@ gem 'gitlab_query_language', '~> 0.26.0', feature_category: :integrations
# standard Gem, version increase to resolve vulnerabilities
gem "zlib", "~> 3.2", ">= 3.2.3", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/work_items/596593
# standard Gem, pin version to resolve vulnerabilities
gem "erb", "= 4.0.3.1", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/work_items/596593

File diff suppressed because it is too large Load diff

View file

@ -40,10 +40,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1yfl7blz9zlww0al921kmyqsmsx8gdphqjnszp5fgpzi8nr1fpg1";
sha256 = "0g5kbrqvhwlliyrzd2bhc3kdiqm58df0x3w716bs0ygwyjil1gyk";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
actionmailbox = {
dependencies = [
@ -62,10 +62,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pjdrdlv14mzq24qx95hpxhfza0k72qc3qymaa6x1wihqfkz1fqn";
sha256 = "0hf59r6sk0qb5va0ga549rbadcb5n1a2ry8nlkszzcksr6039rx4";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
actionmailer = {
dependencies = [
@ -84,10 +84,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1f4axhrdhk9z3hjv6xzxqyj7c3y17mn7kz1li1fv5lm6aaw4dmk8";
sha256 = "0rq4aan18y6gwziabnj1q1486349k1v1i5m7ysv206pqqpavcy7m";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
actionpack = {
dependencies = [
@ -111,10 +111,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1kq7fbgb5yfsjd1na2ghc7assk18ca24kbvsx90p0xwm8v3f851a";
sha256 = "1jp4w493wvfh9246wxk7g00m1a3vmzkvs0rznq62fwvjjdzzwsmn";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
actiontext = {
dependencies = [
@ -133,10 +133,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ds0m7qp55qkprhdkzpxrvbfiam95s58xj7555hf5d5pnzpxkzx6";
sha256 = "1qs350j3zm7sd6xxn61d93mv3lx1ravbjqja12c7nd7a0zs1h52v";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
actionview = {
dependencies = [
@ -156,10 +156,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cpc91crvavdgvc3jqj1nqr9q6s581bm64894pbh8f5l85x7shhz";
sha256 = "0z7zy6ibfpsdj9jbdm54bx3ws4dszcq7qa564jn645rr8dlbh6fy";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
activejob = {
dependencies = [
@ -174,10 +174,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c7zwmhkg9fpkl2isiggs9b2xbf8jf0hhbvmjfgbcrz25m3n8jg4";
sha256 = "1n3fiwm1x3dxwj36n9pspd2bgffyw28ys9yd36hjvf3iwdy25i0b";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
activemodel = {
dependencies = [ "activesupport" ];
@ -190,10 +190,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nrr8w3hxkssgx13bcph8lb876hg57w01fbapy7fj4ijp6p6dbxv";
sha256 = "1l60a6mqx1wgp15ki1cp68djci0czgrikpydii5bd877hndqdq9r";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
activerecord = {
dependencies = [
@ -210,10 +210,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mx087zngip62400z44p969l6fja1fjxliq6kym6npzbii3vgb3g";
sha256 = "0pd0f1hy6rvyanmrklqir33xq0jb2my4jajz7hc38nysfpi175dq";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
activerecord-gitlab = {
dependencies = [ "activerecord" ];
@ -241,10 +241,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0bya6k7i8s6538fa4j2c0a0xrf6kggg8mhrwnkkqj356zaxj452c";
sha256 = "1azzbpfp726yigwzmj8g2jji149wisnwrgb86zix6mk25sj4w8hb";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
activesupport = {
dependencies = [
@ -269,10 +269,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "043vbilaw855c91n5l7g0k0wxj63kngj911685qy74xc1mvwjxan";
sha256 = "0d6bhg9cim83g8cypjd7cms45ng4p9ga69v26i3vp823d98yvsqi";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
addressable = {
dependencies = [ "public_suffix" ];
@ -1511,10 +1511,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
type = "gem";
};
version = "3.4.1";
version = "3.5.1";
};
deb_version = {
groups = [ "default" ];
@ -2043,6 +2043,21 @@ src: {
};
version = "3.0.0";
};
erb = {
dependencies = [ "cgi" ];
groups = [
"default"
"development"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kv5h3f90ai420zz6g19c6x640l2a1h675bw91s6di59pa6fzamw";
type = "gem";
};
version = "4.0.3.1";
};
error_tracking_open_api = {
dependencies = [ "typhoeus" ];
groups = [ "default" ];
@ -2057,15 +2072,16 @@ src: {
groups = [
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0";
type = "gem";
};
version = "1.12.0";
version = "1.13.1";
};
escape_utils = {
groups = [
@ -4473,20 +4489,20 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
type = "gem";
};
version = "0.8.0";
version = "0.8.2";
};
io-event = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cb3j76ybiq1sdjn93mmclxy5wps5lrnf2rfvhb391x369q3db38";
sha256 = "01mcnadg742j3mh58qbz6mxc0zbdpidlqfhmhyxnbgqw7gfvnp61";
type = "gem";
};
version = "1.14.5";
version = "1.14.3";
};
ipaddress = {
groups = [ "default" ];
@ -4514,6 +4530,7 @@ src: {
irb = {
dependencies = [
"pp"
"prism"
"rdoc"
"reline"
];
@ -4525,10 +4542,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
type = "gem";
};
version = "1.15.1";
version = "1.18.0";
};
jaeger-client = {
dependencies = [
@ -4692,15 +4709,17 @@ src: {
dependencies = [ "base64" ];
groups = [
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
sha256 = "115ll278g3zdvff7b05gfxqc9n74vw9xfzcc8jkv22bkphpkbng4";
type = "gem";
};
version = "2.10.2";
version = "2.10.3";
};
kaminari = {
dependencies = [
@ -5272,17 +5291,19 @@ src: {
};
mini_mime = {
groups = [
"danger"
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
type = "gem";
};
version = "1.1.2";
version = "1.1.5";
};
mini_portile2 = {
groups = [
@ -5536,10 +5557,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr";
sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs";
type = "gem";
};
version = "0.5.9";
version = "0.6.4";
};
net-ldap = {
dependencies = [
@ -5616,10 +5637,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
type = "gem";
};
version = "0.3.3";
version = "0.5.1";
};
net-ssh = {
groups = [ "default" ];
@ -5644,16 +5665,17 @@ src: {
nio4r = {
groups = [
"default"
"development"
"puma"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm";
sha256 = "18fwy5yqnvgixq3cn0h63lm8jaxsjjxkmj8rhiv8wpzv9271d43c";
type = "gem";
};
version = "2.7.0";
version = "2.7.5";
};
nkf = {
groups = [ "default" ];
@ -5692,10 +5714,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lss1nh526n3h1qsig2kjchi8vlsjwc8pdjpplm1f2yz6rzk52sr";
sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
type = "gem";
};
version = "1.19.1";
version = "1.19.3";
};
notiffany = {
dependencies = [
@ -5815,14 +5837,17 @@ src: {
"bigdecimal"
"ostruct"
];
groups = [ "default" ];
groups = [
"default"
"monorepo"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0g817hjx1rh4zhvcpb9m6lr6l8yyq3n8vnjm9x1rc5wr51hv6d9n";
sha256 = "1v87lxi5cdaw3fvdf046fwzrgfbmi2ndkl31clh4zb5p1dxrdqzb";
type = "gem";
};
version = "3.16.16";
version = "3.17.3";
};
oj-introspect = {
dependencies = [ "oj" ];
@ -7105,10 +7130,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll";
sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99";
type = "gem";
};
version = "0.6.2";
version = "0.6.3";
};
prawn = {
dependencies = [
@ -7207,14 +7232,15 @@ src: {
groups = [
"default"
"development"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
type = "gem";
};
version = "1.4.0";
version = "1.9.0";
};
proc_to_ast = {
dependencies = [
@ -7331,10 +7357,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb";
type = "gem";
};
version = "5.2.3";
version = "5.3.1";
};
public_suffix = {
groups = [
@ -7563,10 +7589,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zwvc2fa0hm27ygfz1yc2bs52h4wzj1nhpv6cip6g28i2gmi564s";
sha256 = "155skqkjrckvzj1qy37lrnafrillc47qhf3l80g3zvw100ba1h4n";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
rails-controller-testing = {
dependencies = [
@ -7656,10 +7682,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08h44mkf91861agp7xw778gqpf5mppydsfgphgkj7wp6pyk11c3f";
sha256 = "0np1m8xqb4wbzwpg66yjnqjban0di92lbjzcrgnwwhq2w4z3k8xf";
type = "gem";
};
version = "7.2.3";
version = "7.2.3.1";
};
rainbow = {
groups = [
@ -7783,7 +7809,11 @@ src: {
version = "1.8.0";
};
rdoc = {
dependencies = [ "psych" ];
dependencies = [
"erb"
"psych"
"tsort"
];
groups = [
"default"
"development"
@ -7792,10 +7822,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0a83bsmd444pbhga3icwh8c7gm917m1fabq38dy1pn9ywjd17hij";
sha256 = "1dq2bani47fzyqpb4psizfmzxiznvzlajmdikdgik67wd3jx8l0g";
type = "gem";
};
version = "6.13.0";
version = "6.17.0";
};
re2 = {
dependencies = [ "mini_portile2" ];
@ -7984,10 +8014,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
type = "gem";
};
version = "0.6.0";
version = "0.6.3";
};
representable = {
dependencies = [
@ -9320,10 +9350,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";
sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
type = "gem";
};
version = "3.1.7";
version = "3.2.0";
};
strings = {
dependencies = [
@ -9566,10 +9596,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3";
type = "gem";
};
version = "1.3.1";
version = "1.5.0";
};
thread_safe = {
groups = [
@ -9612,15 +9642,16 @@ src: {
groups = [
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm";
sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
type = "gem";
};
version = "0.4.3";
version = "0.6.1";
};
timfel-krb5-auth = {
groups = [
@ -10312,18 +10343,22 @@ src: {
version = "1.2.10";
};
websocket-driver = {
dependencies = [ "websocket-extensions" ];
dependencies = [
"base64"
"websocket-extensions"
];
groups = [
"default"
"development"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n";
sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd";
type = "gem";
};
version = "0.7.6";
version = "0.8.0";
};
websocket-extensions = {
groups = [

View file

@ -10,13 +10,13 @@
buildNpmPackage (finalAttrs: {
pname = "glitchtip-frontend";
version = "6.1.6";
version = "6.1.8";
src = fetchFromGitLab {
owner = "glitchtip";
repo = "glitchtip-frontend";
tag = "v${finalAttrs.version}";
hash = "sha256-CDszzMDvjC8GOg/Nuh1G2Vwq75tOrwBithYOTNubQhM=";
hash = "sha256-y8NPj1xjGnGS9yBFaRjFRxLdTGrAq08T9N7cZN5IeSc=";
};
nodejs = nodejs_22;
@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
npmDepsFetcherVersion = 3;
hash = "sha256-pakglYUPHTB872cVG1IZ3WyYXR5+fFYQr5zvTh2IrMo=";
hash = "sha256-AIzPJpNvGV/U71UFAUwOqx8kb31s7LXhMha4bXV+oCU=";
};
postPatch = ''

View file

@ -76,14 +76,14 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "glitchtip";
version = "6.1.6";
version = "6.1.8";
pyproject = true;
src = fetchFromGitLab {
owner = "glitchtip";
repo = "glitchtip-backend";
tag = "v${finalAttrs.version}";
hash = "sha256-BUWLN3+ob934MgIoDLirY0O8fn6G3zmGA5wuVGPPp7w=";
hash = "sha256-4RAZYGoS1tUbcPVv8L0sFWqFfBX05yXKZHFZDbEn0C0=";
};
postPatch = ''

View file

@ -9,18 +9,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jaq";
version = "3.0.0";
version = "3.1.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
tag = "v${finalAttrs.version}";
hash = "sha256-FhmnJm/MV4WfvhF7DWW6t2D876SIzzq7ODlY2Wmo9mM=";
hash = "sha256-cwHYsLp9uBb3/etH0bGYzNLOJJypeE4qED7jTBESHiE=";
};
strictDeps = true;
cargoHash = "sha256-37yS5xUj04ZjXvVlji7XNTXbt3avQKmkqUMfovhUrtU=";
cargoHash = "sha256-9vLD5aYcnbdjQC+5FsTglLFYhbv/1lSqsfkD8oclwBs=";
nativeInstallCheckInputs = [
versionCheckHook
@ -71,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Jq clone focused on correctness, speed and simplicity";
homepage = "https://github.com/01mf02/jaq";
changelog = "https://github.com/01mf02/jaq/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/01mf02/jaq/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
teams = [ lib.teams.ngi ];
maintainers = with lib.maintainers; [

View file

@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "libtoxcore";
version = "0.2.22";
version = "0.2.23";
src = fetchFromGitHub {
owner = "TokTok";
repo = "c-toxcore";
tag = "v${finalAttrs.version}";
hash = "sha256-Oi0AYV252KPF6omiErCXZvQlxkWvubk0eiegc5OMQHM=";
hash = "sha256-yII4U+PCkQax7d2ZgTClK+mMypZhVPjEcKDdxHcBf6Y=";
fetchSubmodules = true;
};

View file

@ -8,21 +8,25 @@
aml,
ffmpeg,
gnutls,
libdrm,
libjpeg_turbo,
libgbm,
nettle,
pixman,
zlib,
python3,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "neatvnc";
version = "0.9.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "any1";
repo = "neatvnc";
rev = "v${finalAttrs.version}";
hash = "sha256-VStlTsfXbFxTnRGdK1y7MLtCzxbHzraw5GGph3sS/kI=";
hash = "sha256-yEWNiazRxc8G7ToqOcTtCXEuBCgXO64v31Xx1YeOPCM=";
};
strictDeps = true;
@ -37,17 +41,26 @@ stdenv.mkDerivation (finalAttrs: {
aml
ffmpeg
gnutls
libdrm
libjpeg_turbo
libgbm
nettle
pixman
zlib
];
mesonFlags = [
(lib.mesonBool "tests" true)
nativeCheckInputs = [
python3
openssl
];
doCheck = true;
mesonFlags = [
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
__structuredAttrs = true;
meta = {
description = "VNC server library";

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Much faster locate";
homepage = "https://plocate.sesse.net/";
license = lib.licenses.mit;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
peterhoeg
SuperSandro2000

View file

@ -6,23 +6,25 @@
}:
buildGoModule (finalAttrs: {
pname = "prometheus-qbittorrent-exporter";
version = "1.13.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "martabal";
repo = "qbittorrent-exporter";
tag = "v${finalAttrs.version}";
hash = "sha256-ivHTGj2+6c23KW5aT5a8NFzUxV13u0y9UnHttZYTkuA=";
hash = "sha256-bVfYDIT3FMCFs/p+fFwm+xKiqbffPJ26Z2KFmBlqMjg=";
};
sourceRoot = "${finalAttrs.src.name}/src";
vendorHash = "sha256-FHKt2QpvianVVbAJUcaou/+Ok69a8NbkM7ymVgxUi0I=";
vendorHash = "sha256-vw4uwQt/PI8yl81NC3wAdgCiPacg/Pmv2MNlnR9Y/v0=";
ldflags = [
"-s"
"-X 'qbit-exp/app.version=v${finalAttrs.version}'"
];
# Tests create a local http server
__darwinAllowLocalNetworking = true;
passthru.updateScript = nix-update-script { };
meta = {

View file

@ -67,6 +67,14 @@ buildGo126Module (finalAttrs: {
"-X main.PolarOrgID="
];
# some season-pack tests use non-existent source paths (e.g. /media/...) and
# assert on a same-filesystem check that resolves them up to /. go's
# t.TempDir honours $TMPDIR, which defaults to /build. so just point it to
# something sane
preCheck = ''
export TMPDIR=/tmp
'';
nativeInstallCheckInputs = [
versionCheckHook
];

View file

@ -25,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "reframe";
version = "1.15.1";
version = "1.16.0";
src = fetchFromGitHub {
owner = "AlynxZhou";
repo = "reframe";
tag = "v${finalAttrs.version}";
hash = "sha256-3ZCLnmu5Idn4RsypJr+JNqIhT13/pq1Xi4wTidUgCqQ=";
hash = "sha256-2GuQ+Qwlbv83OBgg017MU0n58lGpY1yjsCWQMpXeQlw=";
fetchSubmodules = true;
};

View file

@ -18,13 +18,13 @@ in
buildGoModule (finalAttrs: {
pname = "searchix";
version = "0.4.7";
version = "0.4.8";
src = fetchFromCodeberg {
owner = "alinnow";
repo = "searchix";
tag = "v${finalAttrs.version}";
hash = "sha256-+mvE68j+rozEePbAqIuit+zFZ/nQkiR6VlesD4/ilo8=";
hash = "sha256-WhWIgx5HGynmsSKPdC4bTVnEoShpZjpG4TAuLFSmKZo=";
};
vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";

View file

@ -24,7 +24,7 @@
buildGoModule (finalAttrs: {
pname = "tailscale";
version = "1.98.2";
version = "1.98.5";
outputs = [
"out"
@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
owner = "tailscale";
repo = "tailscale";
tag = "v${finalAttrs.version}";
hash = "sha256-y3JdVYnvfqrAlubnjrM2FD+PRXlNEzOM3yggSczb+rA=";
hash = "sha256-JaVCmMdZMaP/8RaNRmYpQOj+y/NfHuXdqp8qyWNYEqM=";
};
vendorHash = "sha256-mbxLXR2TBgiwyVGfLmMR5xWk+0f66mPDas95Wla70Lk=";

View file

@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "vivaldi";
version = "8.0.4033.42";
version = "8.0.4033.46";
suffix =
{
@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
hash =
{
aarch64-linux = "sha256-qHIUVfD+rVIrBse5xsmJwVjCAszieAJzuHAC/oKzCHA=";
x86_64-linux = "sha256-abaU3PiUQNhpliCnmih96pkU6CgW/S1GgxFKFo8PBmo=";
aarch64-linux = "sha256-Eq6dH65FY8u0OyeoqiCjx+c37Vt//CTVm245OMzxbdk=";
x86_64-linux = "sha256-1rvqwRIRHbGo5vYCIeDFYdOQVMW8K2mshoju75H46qE=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View file

@ -9,6 +9,7 @@
wayland-scanner,
aml,
jansson,
libdrm,
libxkbcommon,
libgbm,
neatvnc,
@ -19,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wayvnc";
version = "0.9.1";
version = "0.10.0";
src = fetchFromGitHub {
owner = "any1";
repo = "wayvnc";
rev = "v${finalAttrs.version}";
hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8=";
hash = "sha256-+CAH2jcIIQqImonWeWxMQyTtEEuuQlaGyl/ajPfClh8=";
};
strictDeps = true;
@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
aml
jansson
libdrm
libxkbcommon
libgbm
neatvnc
@ -54,10 +56,12 @@ stdenv.mkDerivation (finalAttrs: {
];
mesonFlags = [
(lib.mesonBool "tests" true)
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
];
doCheck = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
__structuredAttrs = true;
meta = {
description = "VNC server for wlroots based Wayland compositors";
@ -68,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
headless one, so it is also possible to run wayvnc without a physical
display attached.
'';
mainProgram = "wayvnc";
inherit (finalAttrs.src.meta) homepage;
homepage = "https://github.com/any1/wayvnc";
changelog = "https://github.com/any1/wayvnc/releases/tag/v${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ nickcao ];
mainProgram = "wayvnc";
};
})

View file

@ -56,22 +56,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "weston";
version = "15.0.0";
version = "15.0.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wayland";
repo = "weston";
rev = finalAttrs.version;
hash = "sha256-7FbQkXazsf6FkkNbE+Q6ilKACFa/CoOL2Q1oXHuaVX8=";
hash = "sha256-c6h8GQt1S3t2+K+8A4ncxBtWLtaV61EABdYA55o9i4o=";
};
# Backport for https://gitlab.freedesktop.org/wayland/weston/-/issues/1100
patches = [
# backend-vnc, gitlab-ci: Update to Neat VNC 1.0.0, aml 1.0.0
# https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/2064
(fetchpatch {
name = "weston-upstream-assertion-fix.patch";
url = "https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1993.patch";
hash = "sha256-705GIM7drTzv0N5Hk5dO18LWBnhhi1VoX8sfITHRYc4=";
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8a1c91e771312d1e0d0cd92495ef717402784dae.patch";
hash = "sha256-9eBONM7OfzHhCuT8Wnq534KS51q2VtUyOOLjYHohEds=";
excludes = [ ".gitlab-ci.yml" ];
})
];

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation {
pname = "wlvncc";
version = "0-unstable-2025-07-07";
version = "0-unstable-2026-04-29";
src = fetchFromGitHub {
owner = "any1";
repo = "wlvncc";
rev = "bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2";
hash = "sha256-Udu/CtrNBqnlgZCK2cS8VWNTfHJGXdijTnNIWnAW2Nw=";
rev = "cc0abf87c37920540f2439a556e6a480c28f8f46";
hash = "sha256-VPZJd4/yerWZeLl+NVH1EDtSokeS/XMS6lQUXOn9a7Q=";
};
nativeBuildInputs = [

View file

@ -463,9 +463,11 @@ with haskellLib;
# https://github.com/input-output-hk/io-sim/issues/248
io-sim = dontCheck super.io-sim;
# Test suites broken by hakyll 4.16, but lib is still okay
# https://github.com/LaurentRDC/hakyll-images/issues/14
hakyll-images = dontCheck super.hakyll-images;
# Too strict upper bound on hakyll (<4.17)
# https://gitlab.com/lysxia/hakyll-alectryon/-/work_items/2
hakyll-alectryon = doJailbreak super.hakyll-alectryon;
# https://gitlab.com/aergus/hakyll-filestore/-/work_items/1
hakyll-filestore = doJailbreak super.hakyll-filestore;
# 2024-06-23: Hourglass is archived and had its last commit 6 years ago.
# Patch is needed to add support for time 1.10, which is only used in the tests

View file

@ -0,0 +1,50 @@
{
mkDerivation,
base,
binary,
bytestring,
containers,
directory,
filepath,
hakyll,
HUnit-approx,
JuicyPixels,
JuicyPixels-extra,
lib,
tasty,
tasty-hunit,
vector,
}:
mkDerivation {
pname = "hakyll-images";
version = "1.3.1";
sha256 = "a4f55f08b10671795beab1e3d8496651e3c0a08799d26f36b6357480753e85a8";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base
binary
bytestring
hakyll
JuicyPixels
JuicyPixels-extra
vector
];
testHaskellDepends = [
base
binary
bytestring
containers
directory
filepath
hakyll
HUnit-approx
JuicyPixels
JuicyPixels-extra
tasty
tasty-hunit
vector
];
homepage = "https://github.com/LaurentRDC/hakyll-images#readme";
description = "Hakyll utilities to work with images";
license = lib.licensesSpdx."BSD-3-Clause";
}

View file

@ -0,0 +1,126 @@
{
mkDerivation,
aeson,
base,
binary,
blaze-html,
bytestring,
containers,
contravariant,
data-default,
deepseq,
directory,
file-embed,
filepath,
fsnotify,
hashable,
http-conduit,
http-types,
lib,
lrucache,
mtl,
network-uri,
optparse-applicative,
pandoc,
pandoc-types,
parsec,
process,
QuickCheck,
random,
regex-tdfa,
resourcet,
scientific,
tagsoup,
tasty,
tasty-golden,
tasty-hunit,
tasty-quickcheck,
template-haskell,
text,
time,
time-locale-compat,
util-linux,
vector,
wai,
wai-app-static,
warp,
xml-conduit,
yaml,
}:
mkDerivation {
pname = "hakyll";
version = "4.17.0.0";
sha256 = "a02ae25cce5a1a64d1c0d0d1cac4290916e3839578c57f7efa999b1f4d56673e";
revision = "1";
editedCabalFile = "07i2fkgb12c2cijkc9lc840arabgm0sla7kmdz7jhhr9di4pndh5";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
base
binary
blaze-html
bytestring
containers
contravariant
data-default
deepseq
directory
file-embed
filepath
fsnotify
hashable
http-conduit
http-types
lrucache
mtl
network-uri
optparse-applicative
pandoc
pandoc-types
parsec
process
random
regex-tdfa
resourcet
scientific
tagsoup
template-haskell
text
time
time-locale-compat
vector
wai
wai-app-static
warp
xml-conduit
yaml
];
executableHaskellDepends = [
base
directory
filepath
];
testHaskellDepends = [
aeson
base
bytestring
containers
filepath
pandoc
pandoc-types
QuickCheck
tagsoup
tasty
tasty-golden
tasty-hunit
tasty-quickcheck
yaml
];
testToolDepends = [ util-linux ];
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";
license = lib.licenses.bsd3;
mainProgram = "hakyll-init";
}

View file

@ -13,16 +13,16 @@
twisted,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "daphne";
version = "4.2.1";
version = "4.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "django";
repo = "daphne";
tag = version;
hash = "sha256-MPlvXcg7bBF1yaphjjMtnGsGpp6ca5GsgmXONw/V9Do=";
tag = finalAttrs.version;
hash = "sha256-i0BwZCpMZW6WXK94FSvlEheXHUzXviCBEew6AbkLkpk=";
};
build-system = [ setuptools ];
@ -49,9 +49,9 @@ buildPythonPackage rec {
meta = {
description = "Django ASGI (HTTP/WebSocket) server";
homepage = "https://github.com/django/daphne";
changelog = "https://github.com/django/daphne/blob/${src.tag}/CHANGELOG.txt";
changelog = "https://github.com/django/daphne/blob/${finalAttrs.src.tag}/CHANGELOG.txt";
license = lib.licenses.bsd3;
maintainers = [ ];
mainProgram = "daphne";
};
}
})

View file

@ -20,14 +20,14 @@
buildPythonPackage (finalAttrs: {
pname = "stanza";
version = "1.12.1";
version = "1.12.2";
pyproject = true;
src = fetchFromGitHub {
owner = "stanfordnlp";
repo = "stanza";
tag = "v${finalAttrs.version}";
hash = "sha256-e4f/Th9zCVBe05v7NI+IXiSbCfcKVZvDFAKq8ZrsQjA=";
hash = "sha256-hUI8sZDwBK8ZRS9asyDiTqpoIGnGbHeH/Q9i/gasut0=";
};
build-system = [ setuptools ];

View file

@ -23,35 +23,35 @@
},
"40": {
"hashes": {
"aarch64-darwin": "e889b35e399f374f5dca932195287b373c4b43f8bf242e50c35f88a751511a13",
"aarch64-linux": "b9725dd7a387960e778b66700836d178528ba2235c6b14135fb57ce4d3826257",
"armv7l-linux": "dd3bc8b27e905d7ac1f2d312b795e9f0f7491022aae5719ed5adf8ab4b203ef7",
"aarch64-darwin": "dfb6a853acdc547b6eedc97fa4a30693dba0bd310ab673e436b08b890772b529",
"aarch64-linux": "7a53169a16775f2b62f9434058c2c0e1cdf3f1718800b80712856f4766cf6043",
"armv7l-linux": "ef6ba9eb2e79721f7b1b9957fa71e55fcdbb9b6d1793daf61cd839f48cd1e86b",
"headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2",
"x86_64-darwin": "5d171014187fb737f34c70b09ea886215e3d88a1b79cb5370a0815c34dd15668",
"x86_64-linux": "0246201400600ac089c51a36f15a8045b5db723ba42b864f732a9b4e48731e97"
"x86_64-darwin": "27a4e372ca19394fefedabbf4da0341cfb87c1fa9f5b9cf9b22e8cd8deb4f566",
"x86_64-linux": "d2593a23cc1c080b7333381579a65ecaf9628a70efbc466ddb545141257105a3"
},
"version": "40.10.2"
"version": "40.10.3"
},
"41": {
"hashes": {
"aarch64-darwin": "a092f0c1aa722037fa07d3256d5bf4aef2833d990bf4d09fe907d588c35b341d",
"aarch64-linux": "8a8bc763406ad19954432922347ca7c3c8db130f966871687cfb8b4ddccfa28e",
"armv7l-linux": "895ecc3b61321699c24d3554272d116113c5dc2bf72df9b94ade87957cb8c9b3",
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
"x86_64-darwin": "4e8ab5beb895c9fe29cd46090034b214e6b404868bf5e0a5f6eb92e5c8633cc4",
"x86_64-linux": "0165fc68656f49ad7ae0c4254b1ff3af1718c114b6007a2aeef5211e0562f174"
"aarch64-darwin": "f48986fa0d60b88eee78fd95c1a36e7fac9ab606c63fdabc28adec916b8f12d1",
"aarch64-linux": "d94b0231b05063e5cd959cda2bdb8ec7c94ab86f59698bfba4522343eb48d50e",
"armv7l-linux": "e3d04ffa4e020857a2a2554f7f5e41e746fa692c91c51575199473ddb264e551",
"headers": "0j9gvjjq9qdvjj33h2xh6qdxxr29aj96y2qs3p0xvy1bc3li9hzn",
"x86_64-darwin": "6b561462a94fd02837a525d0bca786a0b4345b61e2e3109c4bf13792235db90d",
"x86_64-linux": "a04bb66fd83c516c8b3adc5fb47f8307fe54704f5b1cd7c8ec9be8285d2989b3"
},
"version": "41.7.1"
"version": "41.7.2"
},
"42": {
"hashes": {
"aarch64-darwin": "19f4b0a4fcc3574e79befb53495cca8de02a126210d04363cf76f67099d128ef",
"aarch64-linux": "2a375ff973fb7bddc538a4f67b2141947e9d72513a1baa2beabec2a7f65cd0f0",
"armv7l-linux": "5d15e602d978d53772ec0c58af4ef02d1ba514dc3d6752ffe79c0ad21804c38c",
"headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7",
"x86_64-darwin": "92bc6bc82cbfe4c855e9b8c55cf48c32f0448553bb74defe8cc436da9588a73e",
"x86_64-linux": "487a667ca6a734b958c16cff1df74d9d44d2c18a6cccdb4dd51f6301a356c420"
"aarch64-darwin": "3ce55988c9998bcd1e9c69478dd26887b90e8f8010441172e520e94ba575e520",
"aarch64-linux": "d3bf612de0b651302fb46e50ed3282b609ea9d4d99bb296f7c9bb8ffd92fd69b",
"armv7l-linux": "83f9017f9a77bfdc8628b05237336c319da45f75974c37c68c82687a18106a92",
"headers": "1jim5dw909wzczdlcrajn03j4v8gsvq6zpk85nl3713b3rx0pjyz",
"x86_64-darwin": "0f141809eebe3f3f8c8f8377c10c93f21a39433f71526598de5e989f452cae29",
"x86_64-linux": "9a8194635548490a56099cc4c2b116738ae56834dee4472506d5a8b262bcbda4"
},
"version": "42.3.0"
"version": "42.4.0"
}
}

View file

@ -23,35 +23,35 @@
},
"40": {
"hashes": {
"aarch64-darwin": "d54eec731e52b9daa25c80f8c5461928a5c8132e3af8f7dc9ecddde3e6da98d6",
"aarch64-linux": "f7cba7e899daae46e4dfaf292425dd61a97edfc6820d16d6ea6a600a8e968390",
"armv7l-linux": "a987bb7b31ed153ac304bc4dbcbfaa48139b60f3d33888ca1bbedb869dd74564",
"aarch64-darwin": "8f19ad2223292532b90e1ee4aa0f6f59e1cf0343055610bac3c0b0bdebc0dc1c",
"aarch64-linux": "6ce2b44eb560e5d305bef4c5886844ccd025d1edf0b7fe758a4fdf46beb8a0e3",
"armv7l-linux": "d2493fa2a16c3dddaccd7b846645ef5b3acd740fb0a206e5b54f9cbc8b288a31",
"headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2",
"x86_64-darwin": "1928d63140157ede242d5111e2a5327abd01f2f9ae23e1a6bf1eb82a53029847",
"x86_64-linux": "e1dd0e162e248ca11aeca1485ccae8d813c7c7a6ef2959c42f1f8f486dad3963"
"x86_64-darwin": "9eb305ea485e72bd01d8d9d45e258a3b6708bb480caad048819141f420373c20",
"x86_64-linux": "494cd1ddfc0745032223a4995360ed5ab65ea1e2fe88612e1ae32398d13b3470"
},
"version": "40.10.2"
"version": "40.10.3"
},
"41": {
"hashes": {
"aarch64-darwin": "adbc1b646cbd2cb6d9e9b6c71bab2caa7c00b05faaa699585f52decd0e89dfa8",
"aarch64-linux": "336f67cce0d702066c9d42fbc1221a2ab136193b85c5ca102dafc4050ebb3a02",
"armv7l-linux": "c7d42966f343703353e1b14a37ac7724f3661f6f11095f845149cafbf3e90941",
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
"x86_64-darwin": "c01e23366b2e51b2c57669831cb57333cc78d6db94b8be500db3347c5425c0a1",
"x86_64-linux": "15abcca021cd649a03aa73c058cdbb3a32bf9cb882191c4930073458de496189"
"aarch64-darwin": "3b820eba3a2ec3805fa437e1d1557cd57634f22960a3232cdfdbadb197df0926",
"aarch64-linux": "187c6bd8dd6339c9f3558bd4f0dab5a71713da6fe7146e18160481045124d39e",
"armv7l-linux": "187df82834a49211c6cdf55f95c6eacfa94c83a95e84965a4cce8ba04075cd0b",
"headers": "0j9gvjjq9qdvjj33h2xh6qdxxr29aj96y2qs3p0xvy1bc3li9hzn",
"x86_64-darwin": "24a7018009ea46cc466f09504824379c430f8b4eb8f5cfc7f5235b81e1fa6def",
"x86_64-linux": "2af603975c4ee6bbd5332d49ec5bf2ded27db818db398b10a620f5ce0e719af7"
},
"version": "41.7.1"
"version": "41.7.2"
},
"42": {
"hashes": {
"aarch64-darwin": "caaf3fe945de448b908aec28eb2012eebd091dd7604d586ccba9d8dcde570564",
"aarch64-linux": "140bac763a2793c82782eef9c27272027a1aace5b02ad2dda99a1bb342063d35",
"armv7l-linux": "e4ddb1ff88404ca0c189a54466924eba6c67e0bd67aeeefe4f894ef09eff7423",
"headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7",
"x86_64-darwin": "c50daf833921ce7c9c4628d8fb8d9b294394cd4202a3dd4cd3a750dec6656ba9",
"x86_64-linux": "3c29fef7bf4873a57318fc25e77bc57bec1758e40ec8c56b4717f8dac2decc71"
"aarch64-darwin": "0ad0294171f61678036771f0a9e9de84b79a063d6781f166991d52d21d41a31f",
"aarch64-linux": "22fc9f5566d3a701965ae2cc77b0625644e827d67a80dfa86fbfd8076354a447",
"armv7l-linux": "b1ec1b8aec371b3b13303074739ddcd006a08060150f10a6c7a364c4b1bfd40c",
"headers": "1jim5dw909wzczdlcrajn03j4v8gsvq6zpk85nl3713b3rx0pjyz",
"x86_64-darwin": "2a736793968997a9f312156a7cb6575b23479ae4f23539d2b0fd1774589576eb",
"x86_64-linux": "09b69da1569f2d0bbf2015a976a314cefa212243cbfcfb32dcb82ef263c52942"
},
"version": "42.3.0"
"version": "42.4.0"
}
}

View file

@ -56,10 +56,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-zpM+4Jok6FGaSKH4JxHKf9xrWNbdEVUBvgvd3Q9JnlU=",
"hash": "sha256-fLk+Vs7u/mZFb4mLmytRPez4Fur5e0QugmuD58fulIs=",
"owner": "electron",
"repo": "electron",
"tag": "v40.10.2"
"tag": "v40.10.3"
},
"fetcher": "fetchFromGitHub"
},
@ -1387,7 +1387,7 @@
},
"modules": "143",
"node": "24.15.0",
"version": "40.10.2"
"version": "40.10.3"
},
"41": {
"chrome": "146.0.7680.216",
@ -1446,10 +1446,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-8I/3aDZgi5iIwujKnUQ/Uxx2VeFAuwvCPXgPl04HQdg=",
"hash": "sha256-Bvm6S7otVUmGjRWOA53ua/7EdyIImHJMbDtVH3Xa4wo=",
"owner": "electron",
"repo": "electron",
"tag": "v41.7.1"
"tag": "v41.7.2"
},
"fetcher": "fetchFromGitHub"
},
@ -2793,10 +2793,10 @@
},
"modules": "145",
"node": "24.15.0",
"version": "41.7.1"
"version": "41.7.2"
},
"42": {
"chrome": "148.0.7778.180",
"chrome": "148.0.7778.254",
"chromium": {
"deps": {
"gn": {
@ -2805,15 +2805,15 @@
"version": "0-unstable-2026-04-01"
}
},
"version": "148.0.7778.180"
"version": "148.0.7778.254"
},
"chromium_npm_hash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8=",
"deps": {
"src": {
"args": {
"hash": "sha256-Cjna6Z4uzdyuqZCacu01f1p2DoNl/x7NaZmU/NoiD3k=",
"hash": "sha256-anHfDRQGlmW1CsH4T1KSLoGdoYvSBJBNBXebMxdXMHE=",
"postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"tag": "148.0.7778.180",
"tag": "148.0.7778.254",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@ -2852,10 +2852,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-HwfRacBv+em/gF+eEm+hAX+k/ZUBzj9DP30aPpydWXk=",
"hash": "sha256-ce/7NTD85RlZtuuYNiuvECxtcLyPHNXAzWwHVdJEqP8=",
"owner": "electron",
"repo": "electron",
"tag": "v42.3.0"
"tag": "v42.4.0"
},
"fetcher": "fetchFromGitHub"
},
@ -2885,8 +2885,8 @@
},
"src/third_party/angle": {
"args": {
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E=",
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
"hash": "sha256-P5KpTB/jaUR8MjrEccc1di5u9dvD/YiVw8/QlkdKZcE=",
"rev": "007b92d82773d7a868a6dce85359232921903959",
"url": "https://chromium.googlesource.com/angle/angle.git"
},
"fetcher": "fetchFromGitiles"
@ -3085,8 +3085,8 @@
},
"src/third_party/dawn": {
"args": {
"hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8=",
"rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3",
"hash": "sha256-LM5Z57mbH1u7XFnHF/p4fN/D9mO6504S0k8gqO6z3HI=",
"rev": "c7de5291f0edba5398383d5592adcc78ba745bff",
"url": "https://dawn.googlesource.com/dawn.git"
},
"fetcher": "fetchFromGitiles"
@ -3165,8 +3165,8 @@
},
"src/third_party/devtools-frontend/src": {
"args": {
"hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8=",
"rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7",
"hash": "sha256-S6agM7HMZ2g2W6e9tYdLSXr0Lc6zeQF9hAYLIeImAYQ=",
"rev": "1fb83ff123c44ab59a480056c8c1ba3d33c2caf0",
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
},
"fetcher": "fetchFromGitiles"
@ -3205,10 +3205,10 @@
},
"src/third_party/electron_node": {
"args": {
"hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=",
"hash": "sha256-LE2x6lkDk2r977zRRApdTTWId/vXql2uOob7aEsnncI=",
"owner": "nodejs",
"repo": "node",
"tag": "v24.15.0"
"tag": "v24.16.0"
},
"fetcher": "fetchFromGitHub"
},
@ -3303,8 +3303,8 @@
},
"src/third_party/freetype/src": {
"args": {
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=",
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
"hash": "sha256-A21ONLz8HxoBkOL/jHfs5YwePmOnFyNdlNYSJa9wers=",
"rev": "6d9fc45fc4bca8aef0b8f65592520673638c3334",
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
},
"fetcher": "fetchFromGitiles"
@ -3359,8 +3359,8 @@
},
"src/third_party/harfbuzz/src": {
"args": {
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM=",
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
"hash": "sha256-WCPEkbiiU8dENM+ik0KokW9Uxmz0xlsRFVVPPOEOZXw=",
"rev": "67bb413f586f36ba44d740319cb7a28b3d283ea6",
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
},
"fetcher": "fetchFromGitiles"
@ -3463,8 +3463,8 @@
},
"src/third_party/libaom/source/libaom": {
"args": {
"hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE=",
"rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c",
"hash": "sha256-H8Eu3BiUIiZcyReGDyFq9UvjdMJOX00ERjru8+I0zL8=",
"rev": "343cee0a952f8c7d329e59ff3ac2c8bdbe70ec6a",
"url": "https://aomedia.googlesource.com/aom.git"
},
"fetcher": "fetchFromGitiles"
@ -3607,8 +3607,8 @@
},
"src/third_party/libyuv": {
"args": {
"hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98=",
"rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05",
"hash": "sha256-ZONwYhTD5/tPk5cm9Dmz59QB+rVxv1l/7lOhBOCMCf4=",
"rev": "957f295ea946cbbd13fcfc46e7066f2efa801233",
"url": "https://chromium.googlesource.com/libyuv/libyuv.git"
},
"fetcher": "fetchFromGitiles"
@ -3744,8 +3744,8 @@
},
"src/third_party/pdfium": {
"args": {
"hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U=",
"rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93",
"hash": "sha256-0VgmDPyF5k81nBXdo88CcIIbz6XRhaiADnG8gwDGZZk=",
"rev": "72ea487e4399c44c3a53a48b104f9612ca772008",
"url": "https://pdfium.googlesource.com/pdfium.git"
},
"fetcher": "fetchFromGitiles"
@ -3840,8 +3840,8 @@
},
"src/third_party/skia": {
"args": {
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE=",
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
"hash": "sha256-3yGenYm9OO63FP53odWv6vfy0fOKsXNpygb4vT8HRQM=",
"rev": "2ac66cfda097720cd8d3e481c45b68b4ba096ef7",
"url": "https://skia.googlesource.com/skia.git"
},
"fetcher": "fetchFromGitiles"
@ -4115,8 +4115,8 @@
},
"src/third_party/webrtc": {
"args": {
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4=",
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
"hash": "sha256-n39HENOXmatsZLF6jdYRsb+wl2cM0i6ngT4Zbyu5ayE=",
"rev": "e3ee86921c57b9f8921045e77f098604803cb66c",
"url": "https://webrtc.googlesource.com/src.git"
},
"fetcher": "fetchFromGitiles"
@ -4155,15 +4155,15 @@
},
"src/v8": {
"args": {
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM=",
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
"hash": "sha256-5wkfQsD5pWMAgsXSGTzMYwBADqJpWqSoJEfIyGYkAno=",
"rev": "0b1a7b33935f88a225ca32de62a13478f329b625",
"url": "https://chromium.googlesource.com/v8/v8.git"
},
"fetcher": "fetchFromGitiles"
}
},
"electron_yarn_data": {
"hash": "sha256-PT4mxXZ2Dcao7/iouNhrFZbGwO7kFbdJANFfA8UR4Ew=",
"hash": "sha256-EIVoXfA3O0v+NgBap129bOm2yl9zFuDx78OLYj0Q/o8=",
"missing_hashes": {
"@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba",
"@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a",
@ -4206,7 +4206,7 @@
}
},
"modules": "146",
"node": "24.15.0",
"version": "42.3.0"
"node": "24.16.0",
"version": "42.4.0"
}
}

View file

@ -363,7 +363,14 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
++ lib.optionals withLibBPF [ libbpf ]
++ lib.optional withTpm2Tss tpm2-tss
++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ]))
++ lib.optional withUkify (
python3Packages.python.withPackages (
ps: with ps; [
cryptography
pefile
]
)
)
++ lib.optionals withPasswordQuality [ libpwquality ]
++ lib.optionals withQrencode [ qrencode ]
++ lib.optionals withLibarchive [ libarchive ]