nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-25.05 into staging-25.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-26 00:21:13 +00:00
committed by GitHub
parent 91d3eef18a 8649b445cd
commit c99b40e89a
88 changed files with 2955 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View File

@@ -48,7 +48,7 @@ jobs:
- name: Create backport PRs
id: backport
uses: korthout/backport-action@ca4972adce8039ff995e618f5fc02d1b7961f27a # v3.3.0
uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'

11
.github/workflows/eval.yml vendored
View File

@@ -279,12 +279,11 @@ jobs:
const diff = JSON.parse(
readFileSync(path.join(artifact, system, 'diff.json'), 'utf-8'),
)
const attrs = [].concat(
diff.added,
diff.removed,
diff.changed,
diff.rebuilds
)
const attrs = []
.concat(diff.added, diff.removed, diff.changed, diff.rebuilds)
// There are some special attributes, which are ignored for rebuilds.
// These only have a single path component, because they lack the `.<system>` suffix.
.filter((attr) => attr.split('.').length > 1)
if (attrs.length > 0) {
core.setFailed(
`${version} on ${system} has changed outpaths!\nNote: Please make sure to update ci/pinned.json separately from changes to other packages.`,

2
ci/eval/compare/maintainers.nix
View File

@@ -73,7 +73,7 @@ let
(lib.unsafeGetAttrPos "pname" drv)
(lib.unsafeGetAttrPos "version" drv)
]
++ lib.optionals (drv.meta.position or null != null) [
++ lib.optionals (drv ? meta.position) [
# Use ".meta.position" for cases when most of the package is
# defined in a "common" section and the only place where
# reference to the file with a derivation the "pos"

265
nixos/modules/config/sysfs.nix Normal file
View File

@@ -0,0 +1,265 @@
{
lib,
config,
utils,
pkgs,
...
}:
let
inherit (lib)
all
any
concatLines
concatStringsSep
escapeShellArg
flatten
floatToString
foldl'
head
isAttrs
isDerivation
isFloat
isList
length
listToAttrs
match
mapAttrsToList
nameValuePair
removePrefix
tail
throwIf
;
inherit (lib.options)
showDefs
showOption
;
inherit (lib.strings)
escapeC
isConvertibleWithToString
;
inherit (lib.path.subpath) join;
inherit (utils) escapeSystemdPath;
cfg = config.boot.kernel.sysfs;
sysfsAttrs = with lib.types; nullOr (either sysfsValue (attrsOf sysfsAttrs));
sysfsValue = lib.mkOptionType {
name = "sysfs value";
description = "sysfs attribute value";
descriptionClass = "noun";
check = v: isConvertibleWithToString v;
merge =
loc: defs:
if length defs == 1 then
(head defs).value
else
(foldl' (
first: def:
# merge definitions if they produce the same value string
throwIf (mkValueString first.value != mkValueString def.value)
"The option \"${showOption loc}\" has conflicting definition values:${
showDefs [
first
def
]
}"
first
) (head defs) (tail defs)).value;
};
mapAttrsToListRecursive =
fn: set:
let
recurse =
p: v:
if isAttrs v && !isDerivation v then mapAttrsToList (n: v: recurse (p ++ [ n ]) v) v else fn p v;
in
flatten (recurse [ ] set);
mkPath = p: "/sys" + removePrefix "." (join p);
hasGlob = p: any (n: match ''(.*[^\\])?[*?[].*'' n != null) p;
mkValueString =
v:
# true will be converted to "1" by toString, saving one branch
if v == false then
"0"
else if isFloat v then
floatToString v # warn about loss of precision
else if isList v then
concatStringsSep "," (map mkValueString v)
else
toString v;
# escape whitespace and linebreaks, as well as the escape character itself,
# to ensure that field boundaries are always preserved
escapeTmpfiles = escapeC [
"\t"
"\n"
"\r"
" "
"\\"
];
tmpfiles = pkgs.runCommand "nixos-sysfs-tmpfiles.d" { } (
''
mkdir "$out"
''
+ concatLines (
mapAttrsToListRecursive (
p: v:
let
path = mkPath p;
in
if v == null then
[ ]
else
''
printf 'w %s - - - - %s\n' \
${escapeShellArg (escapeTmpfiles path)} \
${escapeShellArg (escapeTmpfiles (mkValueString v))} \
>"$out"/${escapeShellArg (escapeSystemdPath path)}.conf
''
) cfg
)
);
in
{
options = {
boot.kernel.sysfs = lib.mkOption {
type = lib.types.submodule {
freeformType = lib.types.attrsOf sysfsAttrs // {
description = "nested attribute set of null or sysfs attribute values";
};
};
description = ''
sysfs attributes to be set as soon as they become available.
Attribute names represent path components in the sysfs filesystem and
cannot be `.` or `..` nor contain any slash character (`/`).
Names may contain shell‐style glob patterns (`*`, `?` and `[…]`)
matching a single path component, these should however be used with
caution, as they may produce unexpected results if attribute paths
overlap.
Values will be converted to strings, with list elements concatenated
with commata and booleans converted to numeric values (`0` or `1`).
`null` values are ignored, allowing removal of values defined in other
modules, as are empty attribute sets.
List values defined in different modules will _not_ be concatenated.
This option may only be used for attributes which can be set
idempotently, as the configured values might be written more than once.
'';
default = { };
example = lib.literalExpression ''
{
# enable transparent hugepages with deferred defragmentaion
kernel.mm.transparent_hugepage = {
enabled = "always";
defrag = "defer";
shmem_enabled = "within_size";
};
devices.system.cpu = {
# configure powesave frequency governor for all CPUs
# the [0-9]* glob pattern ensures that other paths
# like cpufreq or cpuidle are not matched
"cpu[0-9]*" = {
scaling_governor = "powersave";
energy_performance_preference = 8;
};
# disable frequency boost
intel_pstate.no_turbo = true;
};
}
'';
};
};
config = lib.mkIf (cfg != { }) {
systemd = {
paths = {
"nixos-sysfs@" = {
description = "/%I attribute watcher";
pathConfig.PathExistsGlob = "/%I";
unitConfig.DefaultDependencies = false;
};
}
// listToAttrs (
mapAttrsToListRecursive (
p: v:
if v == null then
[ ]
else
nameValuePair "nixos-sysfs@${escapeSystemdPath (mkPath p)}" {
overrideStrategy = "asDropin";
wantedBy = [ "sysinit.target" ];
before = [ "sysinit.target" ];
}
) cfg
);
services."nixos-sysfs@" = {
description = "/%I attribute setter";
unitConfig = {
DefaultDependencies = false;
AssertPathIsMountPoint = "/sys";
AssertPathExistsGlob = "/%I";
};
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
# while we could be tempted to use simple shell script to set the
# sysfs attributes specified by the path or glob pattern, it is
# almost impossible to properly escape a glob pattern so that it
# can be used safely in a shell script
ExecStart = "${lib.getExe' config.systemd.package "systemd-tmpfiles"} --prefix=/sys --create ${tmpfiles}/%i.conf";
# hardening may be overkill for such a simple and short‐lived
# service, the following settings would however be suitable to deny
# access to anything but /sys
#ProtectProc = "noaccess";
#ProcSubset = "pid";
#ProtectSystem = "strict";
#PrivateDevices = true;
#SystemCallErrorNumber = "EPERM";
#SystemCallFilter = [
# "@basic-io"
# "@file-system"
#];
};
};
};
warnings = mapAttrsToListRecursive (
p: v:
if hasGlob p then
"Attribute path \"${concatStringsSep "." p}\" contains glob patterns. Please ensure that it does not overlap with other paths."
else
[ ]
) cfg;
assertions = mapAttrsToListRecursive (p: v: {
assertion = all (n: match ''(\.\.?|.*/.*)'' n == null) p;
message = "Attribute path \"${concatStringsSep "." p}\" has invalid components.";
}) cfg;
};
meta.maintainers = with lib.maintainers; [ mvs ];
}

1
nixos/modules/module-list.nix
View File

@@ -30,6 +30,7 @@
./config/stub-ld.nix
./config/swap.nix
./config/sysctl.nix
./config/sysfs.nix
./config/system-environment.nix
./config/system-path.nix
./config/terminfo.nix

3
nixos/modules/services/monitoring/librenms.nix
View File

@@ -668,6 +668,9 @@ in
${artisanWrapper}/bin/librenms-artisan optimize
echo "${package}" > ${cfg.dataDir}/package
fi
# to make sure to not read an outdated .env file
${artisanWrapper}/bin/librenms-artisan config:cache
'';
};

1
nixos/tests/all-tests.nix
View File

@@ -1294,6 +1294,7 @@ in
syncthing-many-devices = handleTest ./syncthing-many-devices.nix { };
syncthing-no-settings = handleTest ./syncthing-no-settings.nix { };
syncthing-relay = handleTest ./syncthing-relay.nix { };
sysfs = runTest ./sysfs.nix;
sysinit-reactivation = runTest ./sysinit-reactivation.nix;
systemd = handleTest ./systemd.nix { };
systemd-analyze = handleTest ./systemd-analyze.nix { };

37
nixos/tests/sysfs.nix Normal file
View File

@@ -0,0 +1,37 @@
{ lib, ... }:
{
name = "sysfs";
meta.maintainers = with lib.maintainers; [ mvs ];
nodes.machine = {
boot.kernel.sysfs = {
kernel.mm.transparent_hugepage = {
enabled = "always";
defrag = "defer";
shmem_enabled = "within_size";
};
block."*".queue.scheduler = "none";
};
};
testScript =
{ nodes, ... }:
let
inherit (nodes.machine.boot.kernel) sysfs;
in
''
from shlex import quote
def check(filename, contents):
machine.succeed('grep -F -q {} {}'.format(quote(contents), quote(filename)))
check('/sys/kernel/mm/transparent_hugepage/enabled',
'[${sysfs.kernel.mm.transparent_hugepage.enabled}]')
check('/sys/kernel/mm/transparent_hugepage/defrag',
'[${sysfs.kernel.mm.transparent_hugepage.defrag}]')
check('/sys/kernel/mm/transparent_hugepage/shmem_enabled',
'[${sysfs.kernel.mm.transparent_hugepage.shmem_enabled}]')
'';
}

16
pkgs/applications/editors/vscode/vscode.nix
View File

@@ -36,20 +36,20 @@ let
hash =
{
x86_64-linux = "sha256-0zgsR0nk9zsOeEcKhrmAFbAhvKKFNsC8fXjCnxFcndE=";
x86_64-darwin = "sha256-4+3T3axXNfePEkevhLwRPeqoxKs2OTL7B7TiV2BxZWc=";
aarch64-linux = "sha256-iGLtuVFA5NphiF1PU9Pus/nZ8PyCNNzDOpcQ+utYE2I=";
aarch64-darwin = "sha256-E4BopxbqH1lg1Q2NlyWjH8jytabiv5y4hG5ZJW4nqzs=";
armv7l-linux = "sha256-YIidKSsqK3DSAfPd7O1pbft1C/ny/iB+CFbR/T9u7L8=";
x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso=";
x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI=";
aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI=";
aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI=";
armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.104.2";
version = "1.105.0";
# This is used for VS Code - Remote SSH test
rev = "e3a5acfb517a443235981655413d566533107e92";
rev = "03c265b1adee71ac88f833e065f7bb956b60550a";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-Tz1P8eGokG+8thao9dRllAdTxvllhfOEDKH9lC2QwB0=";
hash = "sha256-0tGqGDMmLURqdQwqFWCO10d/RkVha8iC0Uv/JFp9nNQ=";
};
stdenv = stdenvNoCC;
};

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@@ -103,7 +103,7 @@ buildFHSEnv {
gettext
portaudio
miniupnpc
mbedtls_2
mbedtls
lzo
sfml
gsm

4
pkgs/by-name/bi/bind/package.nix
View File

@@ -27,11 +27,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bind";
version = "9.20.12";
version = "9.20.15";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
hash = "sha256-3TLW62dQTopDCq9wtO+JTz0CJrRMfgI3DJsNN38ceZk=";
hash = "sha256-1is4+uSLqD/KYYERLQxxAY2LDyzihdx53GoDZ3Isyrs=";
};
outputs = [

4
pkgs/by-name/bi/bindle/package.nix
View File

@@ -42,5 +42,9 @@ rustPlatform.buildRustPackage rec {
license = licenses.asl20;
maintainers = [ ];
platforms = platforms.unix;
knownVulnerabilities = [
"'bindle' is vulnerable to CVE-2025-62518 and upstream has been archived"
];
};
}

10
pkgs/by-name/br/brave/package.nix
View File

@@ -3,24 +3,24 @@
let
pname = "brave";
version = "1.83.118";
version = "1.83.120";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-daHMBEGYJBLYu2HP2oY1wYLhVC61DNT6EFlK/PBzqcw=";
hash = "sha256-DQX+HKNLakI6G7K53SmcmtmA+h7ZmvkcjUgd/k3C/cc=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-KjcRXDxXAkhgAXgALzCN828+ovp2HURKL+VWT2DIMVI=";
hash = "sha256-E1IKc6ftBO88WVXa0RgjAFhtckBNm/hTQgxzMzK17PY=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-EnCEuLqYdV3gSwvcT19FUtRbPm79TdjUzL39sKpPTd8=";
hash = "sha256-aMyTGhxnExd1kaoHHTZu7UU42/WSOkB9PAyc8M0B/xU=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-brj0EvOwX0i82ndPHBS9mqfliq/YnXyxGeiz4nA1qNw=";
hash = "sha256-lTxFrmQzWWegmlyBc71fL81iTPqVLB3r8q2gqvrlM3o=";
};
};

6
pkgs/by-name/ch/chhoto-url/package.nix
View File

@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chhoto-url";
version = "6.3.2";
version = "6.4.1";
src = fetchFromGitHub {
owner = "SinTan1729";
repo = "chhoto-url";
tag = finalAttrs.version;
hash = "sha256-k5fxU3HWhlYlBjmHNsj4lin7LHdwswbwm5bCVmCMjg8=";
hash = "sha256-1XMZSQpZxkeIW7SLNl/crOYDz1QyWC/SUkFk+tgCQgg=";
};
sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
'';
cargoHash = "sha256-oR1SCEbMMDfQyvhoUJzBiK4VHCZwx+o/PaZBfxPB2K8=";
cargoHash = "sha256-kwZRGXaStcDiZOMMZrOWp6vD4JiwRa6r2e5b2cH1Fk4=";
postInstall = ''
mkdir -p $out/share/chhoto-url

6
pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Biome (JS/TS) wrapper plugin";
hash = "sha256-czgTZXlW+LdTKGtX7JJtG7qAbnWlQpunMY92WiC+X8A=";
hash = "sha256-Ht63tW4FqykpuNlWtyw3cHD2HXs0b6U6Zo9Rd9AXqD8=";
initConfig = {
configExcludes = [ "**/node_modules" ];
configKey = "biome";
@@ -16,6 +16,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-biome";
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
url = "https://plugins.dprint.dev/biome-0.10.4.wasm";
version = "0.10.4";
url = "https://plugins.dprint.dev/biome-0.10.6.wasm";
version = "0.10.6";
}

8
pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Dockerfile code formatter.";
hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk=";
description = "Dockerfile code formatter";
hash = "sha256-GaK1sYdZPwQWJmz2ULcsGpWDiKjgPhqNRoGgQfGOkqc=";
initConfig = {
configExcludes = [ ];
configKey = "dockerfile";
@@ -9,6 +9,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-dockerfile";
updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json";
url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm";
version = "0.3.2";
url = "https://plugins.dprint.dev/dockerfile-0.3.3.wasm";
version = "0.3.3";
}

8
pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Ruff (Python) wrapper plugin.";
hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8=";
description = "Ruff (Python) wrapper plugin";
hash = "sha256-qT+6zPbX3KrONXshwzLoGTWRXM93VKO0lN9ycJujEDM=";
initConfig = {
configExcludes = [ ];
configKey = "ruff";
@@ -12,6 +12,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-ruff";
updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json";
url = "https://plugins.dprint.dev/ruff-0.3.9.wasm";
version = "0.3.9";
url = "https://plugins.dprint.dev/ruff-0.6.1.wasm";
version = "0.6.1";
}

8
pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "CSS, SCSS, Sass and Less formatter.";
hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE=";
description = "CSS, SCSS, Sass and Less formatter";
hash = "sha256-IAIix6c9/GNDZsRk95T/rpvMh7HqFgBoq5KDVYHHOjU=";
initConfig = {
configExcludes = [ "**/node_modules" ];
configKey = "malva";
@@ -14,6 +14,6 @@ mkDprintPlugin {
};
pname = "g-plane-malva";
updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm";
version = "0.11.2";
url = "https://plugins.dprint.dev/g-plane/malva-v0.14.3.wasm";
version = "0.14.3";
}

8
pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter.";
hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI=";
description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter";
hash = "sha256-TQxHIw5IXZwFA/WzIJ33ZckJNkHwW67lnh0cCGkgmrs=";
initConfig = {
configExcludes = [ ];
configKey = "markup";
@@ -19,6 +19,6 @@ mkDprintPlugin {
};
pname = "g-plane-markup_fmt";
updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm";
version = "0.19.0";
url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.0.wasm";
version = "0.24.0";
}

8
pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "GraphQL formatter.";
hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec=";
description = "GraphQL formatter";
hash = "sha256-xEEBnmxxiIPNOePBDS2HG6lfAhR4l53w+QDF2mXdyzg=";
initConfig = {
configExcludes = [ ];
configKey = "graphql";
@@ -12,6 +12,6 @@ mkDprintPlugin {
};
pname = "g-plane-pretty_graphql";
updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json";
url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm";
version = "0.2.1";
url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.3.wasm";
version = "0.2.3";
}

8
pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
View File

@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "YAML formatter.";
hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo=";
description = "YAML formatter";
hash = "sha256-iSh5SRrjQB1hJoKkkup7R+Durcu+cxePa7GDVjwnexU=";
initConfig = {
configExcludes = [ ];
configKey = "yaml";
@@ -12,6 +12,6 @@ mkDprintPlugin {
};
pname = "g-plane-pretty_yaml";
updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json";
url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm";
version = "0.5.0";
url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm";
version = "0.5.1";
}

4
pkgs/by-name/dp/dprint/plugins/update-plugins.py
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python -p nix nixfmt-rfc-style 'python3.withPackages (pp: [ pp.requests ])'
#!nix-shell -i python3 -p nix 'python3.withPackages (ps: [ ps.requests ])'
import json
import os
@@ -138,7 +138,7 @@ def update_plugins():
"updateUrl": update_url,
"pname": pname,
"version": e["version"],
"description": e["description"],
"description": e["description"].rstrip("."),
"initConfig": {
"configKey": e["configKey"],
"configExcludes": e["configExcludes"],

2
pkgs/by-name/dr/draupnir/hashes.json
View File

@@ -1,3 +1,3 @@
{
"yarn_offline_cache_hash": "sha256-jzBjZAqvEVGlk+5ii5s8aWvoYJKVBsh+RGcp63oim5Y="
"yarn_offline_cache_hash": "sha256-EZ8dVRfzAFr8wepLuS90YHvAi9BA+4etVz+Vji+bQVA="
}

6
pkgs/by-name/dr/draupnir/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "draupnir",
"version": "2.7.0",
"version": "2.7.1",
"description": "A moderation tool for Matrix",
"main": "lib/index.js",
"repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -54,7 +54,7 @@
"@sinclair/typebox": "0.34.13",
"@the-draupnir-project/interface-manager": "4.2.5",
"@the-draupnir-project/matrix-basic-types": "1.4.1",
"@the-draupnir-project/mps-interface-adaptor": "0.5.1",
"@the-draupnir-project/mps-interface-adaptor": "0.5.2",
"better-sqlite3": "^9.4.3",
"body-parser": "^1.20.2",
"config": "^3.3.9",
@@ -65,7 +65,7 @@
"matrix-appservice-bridge": "^10.3.1",
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.0",
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.2",
"pg": "^8.8.0",
"yaml": "^2.3.2"
},

4
pkgs/by-name/dr/draupnir/package.nix
View File

@@ -22,13 +22,13 @@ let
in
mkYarnPackage rec {
pname = "draupnir";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "the-draupnir-project";
repo = "Draupnir";
tag = "v${version}";
hash = "sha256-ZzwZg7sevX0qKnlZ4snCcwSejWqA6JHCx3e6vWucO8U=";
hash = "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=";
};
nativeBuildInputs = [

6
pkgs/by-name/du/duplicity/package.nix
View File

@@ -79,16 +79,10 @@ let
[
b2sdk
boto3
cffi
cryptography
ecdsa
idna
pygobject3
fasteners
lockfile
paramiko
pyasn1
pycrypto
# Currently marked as broken.
# pydrive2
future

1
pkgs/by-name/fl/flatpak/package.nix
View File

@@ -228,6 +228,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "system_dbus_proxy" (lib.getExe xdg-dbus-proxy))
(lib.mesonOption "system_fusermount" "/run/wrappers/bin/fusermount3")
(lib.mesonOption "system_install_dir" "/var/lib/flatpak")
(lib.mesonOption "sysconfdir" "/etc")
];
nativeCheckInputs = [

4
pkgs/by-name/gi/gitaly/package.nix
View File

@@ -7,7 +7,7 @@
}:
let
version = "18.5.0";
version = "18.5.1";
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-kVFO8brtXWWGU2nWTtHR1q5RrTIXy2ssra9YjtWsglU=";
hash = "sha256-719FC9+OBX9Li9gkIpusFoZrpMyeDwCsoWxt9pfhI1A=";
};
vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";

4
pkgs/by-name/gi/gitlab-pages/package.nix
View File

@@ -6,14 +6,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "18.5.0";
version = "18.5.1";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-7jMiKN2L4rF4YyqoJW8pzj5rP5g6ScwZ3qkY+OCZOZ8=";
hash = "sha256-UrVH5Ky5aiqquQ2o6bSkqLD4ULl9/vUViOoACantT1Q=";
};
vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";

12
pkgs/by-name/gi/gitlab/data.json
View File

@@ -1,16 +1,16 @@
{
"version": "18.5.0",
"repo_hash": "0r1q6byqv3zziwsw63z7km5jjap7q6222j91lnr048w6cf425n1w",
"version": "18.5.1",
"repo_hash": "0h80pzsfn6lb8mz8igbpkmazzj3kkdwhrqxazjq6g9zrsqsvydx5",
"yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
"frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.5.0-ee",
"rev": "v18.5.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.5.0",
"GITLAB_PAGES_VERSION": "18.5.0",
"GITALY_SERVER_VERSION": "18.5.1",
"GITLAB_PAGES_VERSION": "18.5.1",
"GITLAB_SHELL_VERSION": "14.45.3",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
"GITLAB_WORKHORSE_VERSION": "18.5.0"
"GITLAB_WORKHORSE_VERSION": "18.5.1"
}
}

2
pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
View File

@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "18.5.0";
version = "18.5.1";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

3
pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
View File

@@ -331,7 +331,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared
gem 'device_detector', feature_category: :shared
# Redis
gem 'redis', '~> 5.4.0', feature_category: :redis
# Do NOT upgrade until Rails is upgraded with a version that contains https://github.com/rails/rails/pull/55359.
gem 'redis', '= 5.4.0', feature_category: :redis
gem 'redis-client', '~> 0.25', feature_category: :redis
gem 'redis-cluster-client', '~> 0.13', feature_category: :redis
gem 'redis-clustering', '~> 5.4.0', feature_category: :redis

10
pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
View File

@@ -1624,7 +1624,7 @@ GEM
json
recursive-open-struct (1.1.3)
redcarpet (3.6.0)
redis (5.4.1)
redis (5.4.0)
redis-client (>= 0.22.0)
redis-actionpack (5.5.0)
actionpack (>= 5)
@@ -1634,8 +1634,8 @@ GEM
connection_pool
redis-cluster-client (0.13.5)
redis-client (~> 0.24)
redis-clustering (5.4.1)
redis (= 5.4.1)
redis-clustering (5.4.0)
redis (= 5.4.0)
redis-cluster-client (>= 0.10.0)
redis-namespace (1.11.0)
redis (>= 4)
@@ -2364,7 +2364,7 @@ DEPENDENCIES
rbtrace (~> 0.4)
re2 (~> 2.15)
recaptcha (~> 5.12)
redis (~> 5.4.0)
redis (= 5.4.0)
redis-actionpack (~> 5.5.0)
redis-client (~> 0.25)
redis-cluster-client (~> 0.13)
@@ -2452,4 +2452,4 @@ DEPENDENCIES
yard (~> 0.9)
BUNDLED WITH
2.7.1
2.7.2

8
pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
View File

@@ -7528,10 +7528,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm";
sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
type = "gem";
};
version = "5.4.1";
version = "5.4.0";
};
redis-actionpack = {
dependencies = [
@@ -7579,10 +7579,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1sj4b3j7i3rb5a276g7yyd95kji4j9sl6wmqfgpz39gx06qlni47";
sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw";
type = "gem";
};
version = "5.4.1";
version = "5.4.0";
};
redis-namespace = {
dependencies = [ "redis" ];

73
pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix Normal file
View File

@@ -0,0 +1,73 @@
{
stdenv,
fetchFromGitHub,
cmake,
gtest,
zlib,
copyPkgconfigItems,
makePkgconfigItem,
lib,
testers,
ctestCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kaitai-struct-cpp-stl-runtime";
version = "0.11";
src = fetchFromGitHub {
owner = "kaitai-io";
repo = "kaitai_struct_cpp_stl_runtime";
tag = finalAttrs.version;
sha256 = "sha256-2glGPf08bkzvnkLpQIaG2qiy/yO+bZ14hjIaCKou2vU=";
};
doCheck = true;
outputs = [
"out"
"dev"
];
nativeBuildInputs = [
cmake
copyPkgconfigItems
ctestCheckHook
];
buildInputs = [
zlib
gtest
];
strictDeps = true;
# https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/issues/82
pkgconfigItems = [
(makePkgconfigItem rec {
name = "kaitai-struct-cpp-stl-runtime";
inherit (finalAttrs) version;
cflags = [ "-I${variables.includedir}" ];
libs = [
"-L${variables.libdir}"
"-lkaitai_struct_cpp_stl_runtime"
];
variables = {
includedir = "${placeholder "dev"}/include";
libdir = "${placeholder "out"}/lib";
};
inherit (finalAttrs.meta) description;
})
];
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
meta = {
pkgConfigModules = [ "kaitai-struct-cpp-stl-runtime" ];
description = "Kaitai Struct C++ STL Runtime Library";
homepage = "https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fzakaria ];
};
})

4
pkgs/by-name/ke/keycloak/package.nix
View File

@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "keycloak";
version = "26.4.0";
version = "26.4.1";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
hash = "sha256-mWgTkvop5oRA3DzxxI3Q8kgftLZZteGeJ3Zxgh5SIww=";
hash = "sha256-TUTTBsxRuk907OLFxFyABuOGMaO7EjqnzD0eEQVfl98=";
};
nativeBuildInputs = [

1
pkgs/by-name/ki/killerbee/package.nix
View File

@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [ libgcrypt ];
dependencies = with python3.pkgs; [
pycrypto
pyserial
pyusb
rangeparser

4
pkgs/by-name/li/libtheora/package.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 ''
postPatch = lib.optionalString stdenv.hostPlatform.isAarch32 ''
patchShebangs lib/arm/arm2gnu.pl
'';
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
validatePkgConfig
]
++ lib.optionals stdenv.hostPlatform.isArmv7 [
++ lib.optionals stdenv.hostPlatform.isAarch32 [
# Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
perl
];

16
pkgs/by-name/lo/lockbook/package.nix
View File

@@ -4,7 +4,12 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
nfs-utils ? null, # macOS doesn't need this
makeBinaryWrapper,
}:
let
inherit (stdenv.hostPlatform) isLinux;
in
rustPlatform.buildRustPackage rec {
pname = "lockbook";
version = "25.10.13";
@@ -24,7 +29,16 @@ rustPlatform.buildRustPackage rec {
"lockbook"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
]
++ lib.optionals isLinux [ makeBinaryWrapper ];
postFixup = lib.optionalString isLinux ''
wrapProgram $out/bin/lockbook \
--prefix PATH : "${lib.makeBinPath [ nfs-utils ]}"
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --bash --name lockbook.bash <($out/bin/lockbook completions bash)
installShellCompletion --zsh --name _lockbook <($out/bin/lockbook completions zsh)

4
pkgs/by-name/mi/microsoft-edge/package.nix
View File

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

25
pkgs/by-name/mu/mu/package.nix
View File

@@ -8,6 +8,8 @@
pkg-config,
python3,
cld2,
cli11,
fmt_11,
coreutils,
emacs,
glib,
@@ -16,9 +18,9 @@
xapian,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mu";
version = "1.12.9";
version = "1.12.13";
outputs = [
"out"
@@ -28,8 +30,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k=";
rev = "v${finalAttrs.version}";
hash = "sha256-rz0bxgJtz4qHrfHRjJhnvxtFFNM89A39YH9oJ2YGC5g=";
};
postPatch = ''
@@ -63,7 +65,9 @@ stdenv.mkDerivation rec {
buildInputs = [
cld2
cli11
emacs
fmt_11
glib
gmime3
texinfo
@@ -71,9 +75,10 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dguile=disabled"
"-Dreadline=disabled"
"-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp"
(lib.strings.mesonEnable "guile" false)
(lib.strings.mesonEnable "readline" false)
(lib.strings.mesonEnable "tests" finalAttrs.doCheck)
(lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp")
];
nativeBuildInputs = [
@@ -93,8 +98,8 @@ stdenv.mkDerivation rec {
description = "Collection of utilities for indexing and searching Maildirs";
license = licenses.gpl3Plus;
homepage = "https://www.djcbsoftware.nl/code/mu/";
changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
maintainers = with maintainers; [
changelog = "https://github.com/djcb/mu/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [
antono
chvp
peterhoeg
@@ -102,4 +107,4 @@ stdenv.mkDerivation rec {
mainProgram = "mu";
platforms = platforms.unix;
};
}
})

937
pkgs/by-name/pi/pixieditor/deps.json generated Normal file
View File

@@ -0,0 +1,937 @@
[
{
"pname": "AsyncImageLoader.Avalonia",
"version": "3.3.0",
"hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA="
},
{
"pname": "Avalonia",
"version": "11.3.0",
"hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
"version": "2.1.22045.20230930",
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
},
{
"pname": "Avalonia.BuildServices",
"version": "0.0.31",
"hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.3.0",
"hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
},
{
"pname": "Avalonia.Desktop",
"version": "11.3.0",
"hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.3.0",
"hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.0",
"hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
},
{
"pname": "Avalonia.Headless",
"version": "11.3.0",
"hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao="
},
{
"pname": "Avalonia.Labs.Lottie",
"version": "11.3.1",
"hash": "sha256-+f1jIirOw9DZSb2Y7ppXYBOuAkZ72MzD/+7rP4xaLAc="
},
{
"pname": "Avalonia.Native",
"version": "11.3.0",
"hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.0",
"hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.0",
"hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.0",
"hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.3.0",
"hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
},
{
"pname": "Avalonia.Win32",
"version": "11.3.0",
"hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
},
{
"pname": "Avalonia.X11",
"version": "11.3.0",
"hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.0.5",
"hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.2.0",
"hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.2.0.14",
"hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.0.5",
"hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.2.0",
"hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.2.0.14",
"hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.0.5",
"hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.2.0",
"hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.2.0.14",
"hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.0.5",
"hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.2.0",
"hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.2.0.14",
"hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.0.5",
"hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.2.0",
"hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.2.0.14",
"hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.0.5",
"hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.2.0",
"hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.2.0.14",
"hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so="
},
{
"pname": "Avalonia.Xaml.Interactions.Reactive",
"version": "11.0.5",
"hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.0.5",
"hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.2.0",
"hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.2.0.14",
"hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.0.5",
"hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.2.0",
"hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.2.0.14",
"hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y="
},
{
"pname": "BmpSharp",
"version": "0.2.0",
"hash": "sha256-uUNpbOmeiOOkX5TQauqEF3yTo4puGh7/vgTTb7Eyg9s="
},
{
"pname": "ByteSize",
"version": "2.1.2",
"hash": "sha256-qAxJsWRRedraGr0VzvDEpzAWCZfwkMvcsC4WBEh+q6g="
},
{
"pname": "CLSEncoderDecoder",
"version": "1.0.0",
"hash": "sha256-RSfmfqUn+abzArefdWNT5pIS4hvMEa2abnrhnrKGiPk="
},
{
"pname": "CommunityToolkit.HighPerformance",
"version": "8.3.2",
"hash": "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.4.0",
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
},
{
"pname": "DeviceId",
"version": "6.9.0",
"hash": "sha256-TZjWLotGLchmhvESXa4A0eUqKCPT89aXmqY7smc952I="
},
{
"pname": "DeviceId.Linux",
"version": "6.9.0",
"hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc="
},
{
"pname": "DiscordRichPresence",
"version": "1.3.0.28",
"hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
},
{
"pname": "ExCSS",
"version": "4.3.0",
"hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M="
},
{
"pname": "ExCSS",
"version": "4.3.1",
"hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
},
{
"pname": "FFMpegCore",
"version": "5.1.0",
"hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA="
},
{
"pname": "Hardware.Info",
"version": "101.0.1.1",
"hash": "sha256-Bjztcg1xtZFL+3BafHAS1PWelDLc1XTQjeyr69pO7dA="
},
{
"pname": "HarfBuzzSharp",
"version": "7.3.0.3",
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
},
{
"pname": "HarfBuzzSharp",
"version": "8.3.0.1",
"hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "7.3.0.3",
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0.3",
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "8.3.0.1",
"hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "7.3.0.3",
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "7.3.0.3",
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "8.3.0.1",
"hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
},
{
"pname": "Humanizer.Core",
"version": "2.14.1",
"hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
},
{
"pname": "Instances",
"version": "3.0.0",
"hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
},
{
"pname": "MessagePack",
"version": "2.5.192",
"hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="
},
{
"pname": "MessagePack.Annotations",
"version": "2.5.192",
"hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="
},
{
"pname": "MessagePackAnalyzer",
"version": "2.5.192",
"hash": "sha256-4JU8K72WUCW26IcrustOCBotEGqjspnjgEZcJF3ZCl4="
},
{
"pname": "MicroCom.Runtime",
"version": "0.11.0",
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "6.0.0",
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "8.0.0",
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
},
{
"pname": "Microsoft.Bcl.HashCode",
"version": "6.0.0",
"hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.11.0",
"hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.3.4",
"hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
},
{
"pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
"version": "3.3.0",
"hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.11.0",
"hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.14.0",
"hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.11.0",
"hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.14.0",
"hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
"version": "4.11.0",
"hash": "sha256-/rQzc9HHR6h02Dm9rPsBlQyztgt4itmbTFOMV8rgWfc="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
"version": "4.11.0",
"hash": "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0="
},
{
"pname": "Microsoft.CodeAnalysis.Elfie",
"version": "1.0.0",
"hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="
},
{
"pname": "Microsoft.CodeAnalysis.Features",
"version": "4.11.0",
"hash": "sha256-W/R3JVuWfTTcW/GZjJzdTyxZVZpk1dAgaJPz+UGcgyU="
},
{
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
"version": "4.11.0",
"hash": "sha256-2JC9TipfoAQ1ug4i+PexZemJHFhjnFNv/FqjBIsV6J0="
},
{
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
"version": "4.11.0",
"hash": "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE="
},
{
"pname": "Microsoft.CSharp",
"version": "4.7.0",
"hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
},
{
"pname": "Microsoft.DiaSymReader",
"version": "2.0.0",
"hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "3.1.6",
"hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.0",
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.0",
"hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "8.0.0",
"hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
},
{
"pname": "Microsoft.NET.StringTools",
"version": "17.6.3",
"hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "2.0.0",
"hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "4.5.0",
"hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "5.0.0",
"hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "Newtonsoft.Json",
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "OneOf",
"version": "3.0.271",
"hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
},
{
"pname": "protobuf-net",
"version": "3.2.52",
"hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.52",
"hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ="
},
{
"pname": "Qoi.NetStandard",
"version": "1.0.0",
"hash": "sha256-pjJUeRSKaU7NdFwi0gHfmRJUodzgUB4Amz8ERQso+nY="
},
{
"pname": "ShimSkiaSharp",
"version": "3.0.3",
"hash": "sha256-Nngzb1buTzSYvNBS5TUOiJcN71ySM8i6HrPskLEQttM="
},
{
"pname": "ShimSkiaSharp",
"version": "3.0.5",
"hash": "sha256-sjVmij064B96wC00JfTW9wsrK0/Uh1ewwvcw1qXxFMo="
},
{
"pname": "Silk.NET.Core",
"version": "2.22.0",
"hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc="
},
{
"pname": "Silk.NET.Maths",
"version": "2.22.0",
"hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE="
},
{
"pname": "Silk.NET.OpenGL",
"version": "2.22.0",
"hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo="
},
{
"pname": "Silk.NET.Vulkan",
"version": "2.22.0",
"hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY="
},
{
"pname": "Silk.NET.Vulkan.Extensions.EXT",
"version": "2.22.0",
"hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk="
},
{
"pname": "Silk.NET.Vulkan.Extensions.KHR",
"version": "2.22.0",
"hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U="
},
{
"pname": "SkiaSharp",
"version": "2.88.8",
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
},
{
"pname": "SkiaSharp",
"version": "3.116.1",
"hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
},
{
"pname": "SkiaSharp",
"version": "3.118.0-preview.1.2",
"hash": "sha256-3vy6mQ11MqelRv6j1eGJKkNgLkr/geT99m75xiYrVbM="
},
{
"pname": "SkiaSharp",
"version": "3.119.0",
"hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
},
{
"pname": "SkiaSharp.HarfBuzz",
"version": "3.116.1",
"hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "2.88.9",
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "3.119.0",
"hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.8",
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.9",
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.116.1",
"hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.118.0-preview.1.2",
"hash": "sha256-Cgf2xL9Zmib61u+IBDSivMiTr0QjB6t6nZp9npNS5f8="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.119.0",
"hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "2.88.9",
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "3.119.0",
"hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.8",
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.116.1",
"hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.118.0-preview.1.2",
"hash": "sha256-UWMf4l1D0Q+RkTIQ0Aslf4zsL3XrsbZ15cy4ou42+34="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.119.0",
"hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
},
{
"pname": "SkiaSharp.Skottie",
"version": "2.88.8",
"hash": "sha256-+ldOojWMQi51wK88msauHBnzNqyRW6RRokF6+yn4nwo="
},
{
"pname": "Svg.Controls.Skia.Avalonia",
"version": "11.3.0.1",
"hash": "sha256-e+GW+mFWFvw/Dzhf7xVQnZMCCn1e9Po6XKtHCd11GfY="
},
{
"pname": "Svg.Controls.Skia.Avalonia",
"version": "11.3.0.3",
"hash": "sha256-X0Plwm75PMMjlSLV+qr25ye5g9jc93Dv1J7bcNW1m+g="
},
{
"pname": "Svg.Custom",
"version": "3.0.3",
"hash": "sha256-faH73+8y0A7p+koyd3Y4CcYI8U/cAbH1X566bMd3dI4="
},
{
"pname": "Svg.Custom",
"version": "3.0.5",
"hash": "sha256-OY5wMjwk++n41cRDJIBvsfSjLqLCqU5lwkCWNbqrm9w="
},
{
"pname": "Svg.Model",
"version": "3.0.3",
"hash": "sha256-ncQwRRi51A12bpZKjG2ZhaLUJ7MD9ny1lwKUYwr63LE="
},
{
"pname": "Svg.Model",
"version": "3.0.5",
"hash": "sha256-QLghW+2QFzAzCLE52oqt+NT/M3LxWFX7GVG6t84Ilw8="
},
{
"pname": "Svg.Skia",
"version": "3.0.3",
"hash": "sha256-tQ8a1Gt92IPAXhEY9osBZXUZk2sXM19CWf4zt71mwk8="
},
{
"pname": "Svg.Skia",
"version": "3.0.5",
"hash": "sha256-zfmwCIfDJKfFuXAR/fdmdK3xsficRFTIMoaeaBKF2hU="
},
{
"pname": "System.Buffers",
"version": "4.5.1",
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{
"pname": "System.Buffers",
"version": "4.6.0",
"hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
},
{
"pname": "System.CodeDom",
"version": "8.0.0",
"hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
},
{
"pname": "System.Collections.Immutable",
"version": "6.0.0",
"hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
},
{
"pname": "System.Collections.Immutable",
"version": "8.0.0",
"hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
},
{
"pname": "System.Collections.Immutable",
"version": "9.0.0",
"hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
},
{
"pname": "System.Composition",
"version": "8.0.0",
"hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="
},
{
"pname": "System.Composition.AttributedModel",
"version": "8.0.0",
"hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
},
{
"pname": "System.Composition.Convention",
"version": "8.0.0",
"hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="
},
{
"pname": "System.Composition.Hosting",
"version": "8.0.0",
"hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="
},
{
"pname": "System.Composition.Runtime",
"version": "8.0.0",
"hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="
},
{
"pname": "System.Composition.TypedParts",
"version": "8.0.0",
"hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "8.0.0",
"hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
},
{
"pname": "System.Data.DataSetExtensions",
"version": "4.5.0",
"hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "8.0.0",
"hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
},
{
"pname": "System.Diagnostics.PerformanceCounter",
"version": "8.0.0",
"hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.IO.Pipelines",
"version": "9.0.3",
"hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
},
{
"pname": "System.Management",
"version": "8.0.0",
"hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
},
{
"pname": "System.Memory",
"version": "4.5.5",
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
"pname": "System.Reactive",
"version": "5.0.0",
"hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
},
{
"pname": "System.Reactive",
"version": "6.0.0",
"hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
},
{
"pname": "System.Reactive",
"version": "6.0.1",
"hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
},
{
"pname": "System.Reflection.Emit",
"version": "4.7.0",
"hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.7.0",
"hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.7.0",
"hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
},
{
"pname": "System.Reflection.Metadata",
"version": "8.0.0",
"hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
},
{
"pname": "System.Reflection.Metadata",
"version": "9.0.0",
"hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Security.AccessControl",
"version": "4.5.0",
"hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "8.0.0",
"hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.5.0",
"hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Text.Encoding.CodePages",
"version": "7.0.0",
"hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
},
{
"pname": "System.Text.Encodings.Web",
"version": "7.0.0",
"hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="
},
{
"pname": "System.Text.Encodings.Web",
"version": "8.0.0",
"hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.3",
"hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
},
{
"pname": "System.Text.Json",
"version": "7.0.2",
"hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="
},
{
"pname": "System.Text.Json",
"version": "8.0.0",
"hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
},
{
"pname": "System.Text.Json",
"version": "9.0.3",
"hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
},
{
"pname": "System.Threading.Channels",
"version": "7.0.0",
"hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.21.2",
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
},
{
"pname": "Wasmtime",
"version": "22.0.0",
"hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A="
}
]

7
pkgs/by-name/pi/pixieditor/mimeinfo.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-pixieditor">
<comment>PixiEditor project file</comment>
<glob pattern="*.pixi" />
</mime-type>
</mime-info>

182
pkgs/by-name/pi/pixieditor/package.nix Normal file
View File

@@ -0,0 +1,182 @@
{
lib,
stdenv,
writeText,
fetchFromGitHub,
dotnetCorePackages,
buildDotnetModule,
ffmpeg-headless,
vulkan-loader,
openssl,
libGL,
libX11,
libICE,
libSM,
libXi,
libXcursor,
libXext,
libXrandr,
makeDesktopItem,
copyDesktopItems,
}:
let
inherit (dotnetCorePackages) fetchNupkg;
buildInfo = {
id = "NixOS";
name = "for NixOS";
};
appSettings = writeText "appsettings.json" (
lib.strings.toJSON {
PixiEditorApiUrl = "https://auth.pixieditor.net";
PixiEditorApiKey = "waIvElX0fPqaxnyD7Rh1SSEvdq8qfKUs";
AnalyticsUrl = "https://api.pixieditor.net/analytics/";
}
);
in
buildDotnetModule (finalAttrs: {
pname = "pixieditor";
version = "2.0.1.14";
src = fetchFromGitHub {
owner = "PixiEditor";
repo = "PixiEditor";
tag = finalAttrs.version;
hash = "sha256-wyqt5mpT4xmaTk7RidQOOZAgkgMfcKiz5/7Nle0/Tkg=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace ./src/PixiEditor/Helpers/VersionHelpers.cs \
--replace-fail 'builder.Append(" Release Build");' 'builder.Append(" ${buildInfo.name}");' \
--replace-fail 'return "Release";' 'return "${buildInfo.id}";';
substituteInPlace ./src/PixiEditor/Models/ExceptionHandling/CrashReport.cs \
--replace-fail 'ShellExecute(fileName,' 'ShellExecute("${placeholder "out"}/bin/pixieditor",';
rm -rf ./src/PixiEditor.AnimationRenderer.FFmpeg/ThirdParty/{Linux,Macos,Windows}/*
substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \
--replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \
--replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' ';
'';
nativeBuildInputs = [
copyDesktopItems
];
buildInputs = [
(fetchNupkg {
pname = "protobuf-net.protogen";
version = "3.2.52";
hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY=";
})
];
nugetDeps = ./deps.json;
linkNugetPackages = true;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetFlags =
lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];
buildType = "ReleaseNoUpdate";
projectFile = [
"src/PixiEditor.Desktop/PixiEditor.Desktop.csproj"
"src/PixiEditor/PixiEditor.csproj"
"src/PixiEditor.Linux/PixiEditor.Linux.csproj"
"src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj"
];
executables = [ "PixiEditor.Desktop" ];
runtimeDeps = [
vulkan-loader
openssl
libGL
libX11
libICE
libSM
libXi
libXcursor
libXext
libXrandr
];
desktopItems = [
(makeDesktopItem {
name = "pixieditor";
type = "Application";
desktopName = "PixiEditor";
genericName = "2D Editor";
comment = finalAttrs.meta.description;
icon = "pixieditor";
exec = "pixieditor %f";
tryExec = "pixieditor";
startupWMClass = "pixieditor";
terminal = false;
categories = [
"Graphics"
"2DGraphics"
"RasterGraphics"
"VectorGraphics"
];
keywords = [
"editor"
"image"
"2d"
"graphics"
"design"
"vector"
"raster"
];
mimeTypes = [
"application/x-pixieditor"
];
extraConfig.SingleMainWindow = "true";
})
];
postConfigure = ''
dotnet build -t:InstallProtogen \
src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
'';
postInstall = ''
install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json;
install -Dm644 ${./mimeinfo.xml} $out/share/mime/packages/pixieditor.xml;
install -Dm644 src/PixiEditor/Images/PixiEditorLogo.svg \
$out/share/icons/hicolor/scalable/apps/pixieditor.svg;
'';
postFixup = ''
mv $out/bin/PixiEditor.Desktop $out/bin/pixieditor
'';
meta = {
description = "Universal editor for all your 2D needs";
longDescription = ''
PixiEditor is a universal 2D platform that aims to provide you with tools and features for all your 2D needs.
Create beautiful sprites for your games, animations, edit images, create logos. All packed in an eye-friendly dark theme
'';
homepage = "https://pixieditor.com";
changelog = "https://github.com/PixiEditor/PixiEditor/releases/tag/${finalAttrs.version}";
mainProgram = "pixieditor";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [
griffi-gh
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
})

4
pkgs/by-name/pr/proton-ge-bin/package.nix
View File

@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-20";
version = "GE-Proton10-21";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-sJkaDEnfAuEqcLDBtAfU6Rny3P3lOCnG1DusWfvv2Fg=";
hash = "sha256-Oa9+DjEeZZiJEr9H7wnUtGb6v/JXHk0qt0GAGcp3JFQ=";
};
dontUnpack = true;

1
pkgs/by-name/qq/qq/package.nix
View File

@@ -37,6 +37,7 @@ let
pname = "qq";
inherit (source) version src;
passthru = {
# nixpkgs-update: no auto update
updateScript = ./update.sh;
};
meta = {

33
pkgs/by-name/se/secretspec/package.nix Normal file
View File

@@ -0,0 +1,33 @@
{
lib,
rustPlatform,
fetchCrate,
pkg-config,
dbus,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "secretspec";
version = "0.3.3";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-vbGUnYLL8U9CZmMLGfBxk3+0cjZR62Ug1rsis4O4iNk=";
};
cargoHash = "sha256-q5d+8QsyS5eMVeuwn3AYY3Mxs5nWiYtLeAJzY7SAuuQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Declarative secrets, every environment, any provider";
homepage = "https://secretspec.dev";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ domenkozar ];
mainProgram = "secretspec";
};
})

14
pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
View File

@@ -1,14 +1,14 @@
diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
index c983fc3..2ab06dc 100755
--- a/node/build_node_bridge.py
+++ b/node/build_node_bridge.py
@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:
cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'
# Enable ARMv8 cryptography acceleration when available
index a2da3c8b..cb5d475f 100755
--- i/node/build_node_bridge.py
+++ w/node/build_node_bridge.py
@@ -154,9 +154,6 @@ def main(args: Optional[List[str]] = None) -> int:
cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'
# Access tokio's unstable metrics
cargo_env['RUSTFLAGS'] += ' --cfg tokio_unstable'
- # Strip absolute paths
- for path in build_helpers.rust_paths_to_remap():
- cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='
# If set (below), will post-process the build library using this instead of just `cp`-ing it.
objcopy = None

8
pkgs/by-name/si/signal-desktop/libsignal-node.nix
View File

@@ -24,23 +24,23 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "libsignal-node";
version = "0.81.1";
version = "0.83.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "libsignal";
tag = "v${finalAttrs.version}";
hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w=";
hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";
};
cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y=";
cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";
npmRoot = "node";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-npm-deps";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No=";
hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";
};
nativeBuildInputs = [

16
pkgs/by-name/si/signal-desktop/package.nix
View File

@@ -50,13 +50,13 @@ let
'';
});
version = "7.73.0";
version = "7.76.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "Signal-Desktop";
tag = "v${version}";
hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8=";
hash = "sha256-zwywpQ/1LYSofXPMLtYt7c0PLlzgNedRGqslPJur61g=";
};
sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -67,7 +67,7 @@ let
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname src version;
fetcherVersion = 1;
hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
hash = "sha256-WUwclz7dJl+s5zRjWu/HTJ5eZroAFA6vR8mZzwib6Po=";
};
strictDeps = true;
@@ -132,15 +132,15 @@ stdenv.mkDerivation (finalAttrs: {
fetcherVersion = 1;
hash =
if withAppleEmojis then
"sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA="
"sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI="
else
"sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss=";
"sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1759413120;
SOURCE_DATE_EPOCH = 1761172657;
};
preBuild = ''
@@ -216,12 +216,10 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png
done
# TODO: Remove --ozone-platform=wayland after next electron update,
# see https://github.com/electron/electron/pull/48309
makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \
--add-flags "$out/share/signal-desktop/app.asar" \
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
runHook postInstall
'';

80
pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
View File

@@ -49,11 +49,11 @@ diff --git a/package.json b/package.json
index 5755fec..86125ba 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,6 @@
@@ -154,7 +154,6 @@
"dashdash": "2.0.0",
"direction": "1.0.4",
"emoji-datasource": "15.1.2",
- "emoji-datasource-apple": "15.1.2",
"emoji-datasource": "16.0.0",
- "emoji-datasource-apple": "16.0.0",
"emoji-regex": "10.4.0",
"encoding": "0.1.13",
"fabric": "4.6.0",
@@ -64,46 +64,46 @@ index 5755fec..86125ba 100644
-}
+}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f04b2b1..070fa0f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -184,9 +184,6 @@ importers:
diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
index b162101a8..82ee9d67e 100644
--- i/pnpm-lock.yaml
+++ w/pnpm-lock.yaml
@@ -197,9 +197,6 @@ importers:
emoji-datasource:
specifier: 15.1.2
version: 15.1.2
specifier: 16.0.0
version: 16.0.0
- emoji-datasource-apple:
- specifier: 15.1.2
- version: 15.1.2
- specifier: 16.0.0
- version: 16.0.0
emoji-regex:
specifier: 10.4.0
version: 10.4.0
@@ -4817,9 +4814,6 @@ packages:
@@ -5814,9 +5811,6 @@ packages:
resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
engines: {node: '>=12'}
- emoji-datasource-apple@15.1.2:
- resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==}
- emoji-datasource-apple@16.0.0:
- resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==}
-
emoji-datasource@15.1.2:
resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==}
@@ -14990,8 +14984,6 @@ snapshots:
emoji-datasource@16.0.0:
resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
@@ -17037,8 +17031,6 @@ snapshots:
emittery@0.13.1: {}
- emoji-datasource-apple@15.1.2: {}
- emoji-datasource-apple@16.0.0: {}
-
emoji-datasource@15.1.2: {}
emoji-datasource@16.0.0: {}
emoji-regex@10.4.0: {}
diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
index 78c7563..83d196c 100644
--- a/stylesheets/components/fun/FunEmoji.scss
+++ b/stylesheets/components/fun/FunEmoji.scss
index ea029fd5b..0e3563b4f 100644
--- i/stylesheets/components/fun/FunEmoji.scss
+++ w/stylesheets/components/fun/FunEmoji.scss
@@ -5,19 +5,9 @@
$emoji-sprite-sheet-grid-item-count: 62;
@mixin emoji-sprite($sheet, $margin, $scale) {
- $size: calc($sheet * 1px * $scale);
- $margin-start: calc($margin * $scale);
@@ -123,16 +123,22 @@ index 78c7563..83d196c 100644
+ background-position: center;
background-repeat: no-repeat;
}
diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx
index 08785e8..d25b868 100644
index ddb30bf6d..5fc39339b 100644
--- a/ts/components/fun/FunEmoji.tsx
+++ b/ts/components/fun/FunEmoji.tsx
@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji';
export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji';
function getEmojiJumboUrl(emoji: EmojiVariantData): string {
- return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
@@ -20,13 +20,14 @@ function getEmojiJumboBackground(
emoji: EmojiVariantData,
size: number | undefined
): string | null {
- if (size != null && size < MIN_JUMBOMOJI_SIZE) {
- return null;
- }
- if (KNOWN_JUMBOMOJI.has(emoji.value)) {
- return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`;
- }
- return null;
+ const emojiToNotoName = (emoji: string): string =>
+ `emoji_u${
+ [...emoji]
@@ -140,7 +146,7 @@ index 08785e8..d25b868 100644
+ .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))
+ .join("_")
+ }.png`;
+ return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;
+ return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`;
}
export type FunStaticEmojiSize =

11
pkgs/by-name/si/signal-desktop/ringrtc.nix
View File

@@ -20,16 +20,21 @@ let
in
rustPackages_1_89.rustPlatform.buildRustPackage (finalAttrs: {
pname = "ringrtc";
version = "2.58.1";
version = "2.59.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "ringrtc";
tag = "v${finalAttrs.version}";
hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA=";
hash = "sha256-zgDXkkKJrcD357DxbPq/sL/c4AG8xyMPY5IpcBtvATY=";
};
cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q=";
cargoHash = "sha256-uwMNJ+PQa/Q7XZ9QONo+vm2wMqGwOEB97Kl/RFQkdhU=";
preConfigure = ''
# Check for matching webrtc version
grep 'webrtc.version=${webrtc.version}' config/version.properties
'';
cargoBuildFlags = [
"-p"

132
pkgs/by-name/si/signal-desktop/webrtc-sources.json
View File

@@ -1,33 +1,25 @@
{
"src": {
"args": {
"hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=",
"hash": "sha256-mNj4Sw7EROc2Cn4nPSm789h1je7EOjNAg2s6fQ19Dcc=",
"owner": "signalapp",
"repo": "webrtc",
"tag": "7204c"
"tag": "7339c"
},
"fetcher": "fetchFromGitHub"
},
"src/base": {
"args": {
"hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=",
"rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390",
"url": "https://chromium.googlesource.com/chromium/src/base"
},
"fetcher": "fetchFromGitiles"
},
"src/build": {
"args": {
"hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=",
"rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb",
"hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=",
"rev": "66d076c7ab192991f67891b062b35404f3cb0739",
"url": "https://chromium.googlesource.com/chromium/src/build"
},
"fetcher": "fetchFromGitiles"
},
"src/buildtools": {
"args": {
"hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=",
"rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654",
"hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=",
"rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3",
"url": "https://chromium.googlesource.com/chromium/src/buildtools"
},
"fetcher": "fetchFromGitiles"
@@ -43,40 +35,40 @@
},
"src/testing": {
"args": {
"hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=",
"rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647",
"hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=",
"rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d",
"url": "https://chromium.googlesource.com/chromium/src/testing"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party": {
"args": {
"hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=",
"rev": "8a150db896356cd9b47f8c1a6d916347393f90f2",
"hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=",
"rev": "e30091e8987ee0bb0cd30bc467250a96a7614762",
"url": "https://chromium.googlesource.com/chromium/src/third_party"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/boringssl/src": {
"args": {
"hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=",
"rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
"hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=",
"rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac",
"url": "https://boringssl.googlesource.com/boringssl.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/breakpad/breakpad": {
"args": {
"hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=",
"rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
"hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=",
"rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
"url": "https://chromium.googlesource.com/breakpad/breakpad.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/catapult": {
"args": {
"hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=",
"rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
"hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=",
"rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
"url": "https://chromium.googlesource.com/catapult.git"
},
"fetcher": "fetchFromGitiles"
@@ -107,8 +99,8 @@
},
"src/third_party/compiler-rt/src": {
"args": {
"hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=",
"rev": "57196dd146582915c955f6d388e31aea93220c51",
"hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=",
"rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
},
"fetcher": "fetchFromGitiles"
@@ -123,24 +115,24 @@
},
"src/third_party/dav1d/libdav1d": {
"args": {
"hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
"rev": "8d956180934f16244bdb58b39175824775125e55",
"hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=",
"rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/depot_tools": {
"args": {
"hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=",
"rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
"hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=",
"rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/ffmpeg": {
"args": {
"hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=",
"rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
"hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=",
"rev": "d2d06b12c22d27af58114e779270521074ff1f85",
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
},
"fetcher": "fetchFromGitiles"
@@ -155,24 +147,24 @@
},
"src/third_party/fontconfig/src": {
"args": {
"hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=",
"rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
"hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=",
"rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
"url": "https://chromium.googlesource.com/external/fontconfig.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/freetype/src": {
"args": {
"hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=",
"rev": "e07e56c7f106b600262ab653d696b7b57f320127",
"hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=",
"rev": "08805be530d6820d2bf8a1b7685826de40f06812",
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/fuzztest/src": {
"args": {
"hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=",
"rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
"hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=",
"rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
},
"fetcher": "fetchFromGitiles"
@@ -187,24 +179,24 @@
},
"src/third_party/googletest/src": {
"args": {
"hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=",
"rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
"hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=",
"rev": "373af2e3df71599b87a40ce0e37164523849166b",
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/grpc/src": {
"args": {
"hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=",
"rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28",
"hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=",
"rev": "806e186735cc3bf4375f43d2d6a9483c607e4278",
"url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/gtest-parallel": {
"args": {
"hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=",
"rev": "96f4f904922f9bf66689e749c40f314845baaac8",
"hash": "sha256-uVq+oDrue4sf1JPoeymIIDe79Fv7rcJAVOjxUF42Xo0=",
"rev": "cd488bdedc1d2cffb98201a17afc1b298b0b90f1",
"url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel"
},
"fetcher": "fetchFromGitiles"
@@ -219,8 +211,8 @@
},
"src/third_party/icu": {
"args": {
"hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=",
"rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
"hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
"rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
"url": "https://chromium.googlesource.com/chromium/deps/icu.git"
},
"fetcher": "fetchFromGitiles"
@@ -243,32 +235,32 @@
},
"src/third_party/libFuzzer/src": {
"args": {
"hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
"rev": "e31b99917861f891308269c36a32363b120126bb",
"hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
"rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libaom/source/libaom": {
"args": {
"hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
"rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
"hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=",
"rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
"url": "https://aomedia.googlesource.com/aom.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libc++/src": {
"args": {
"hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=",
"rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
"hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=",
"rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libc++abi/src": {
"args": {
"hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=",
"rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
"hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=",
"rev": "a6c815c69d55ec59d020abde636754d120b402ad",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
},
"fetcher": "fetchFromGitiles"
@@ -291,32 +283,32 @@
},
"src/third_party/libunwind/src": {
"args": {
"hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=",
"rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
"hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=",
"rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libvpx/source/libvpx": {
"args": {
"hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=",
"rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
"hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=",
"rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
"url": "https://chromium.googlesource.com/webm/libvpx.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libyuv": {
"args": {
"hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=",
"rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
"hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=",
"rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
"url": "https://chromium.googlesource.com/libyuv/libyuv.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/llvm-libc/src": {
"args": {
"hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=",
"rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
"hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=",
"rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
},
"fetcher": "fetchFromGitiles"
@@ -331,8 +323,8 @@
},
"src/third_party/nasm": {
"args": {
"hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=",
"rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
"hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
"rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
},
"fetcher": "fetchFromGitiles"
@@ -347,8 +339,8 @@
},
"src/third_party/perfetto": {
"args": {
"hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=",
"rev": "dd35b295cd359ba094404218414955f961a0d6ae",
"hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=",
"rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed",
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
},
"fetcher": "fetchFromGitiles"
@@ -363,16 +355,16 @@
},
"src/third_party/re2/src": {
"args": {
"hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
"rev": "c84a140c93352cdabbfb547c531be34515b12228",
"hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=",
"rev": "8451125897dd7816a5c118925e8e42309d598ecc",
"url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
},
"fetcher": "fetchFromGitiles"
},
"src/tools": {
"args": {
"hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=",
"rev": "901b847deda65d44f1bba16a9f47e2ea68a805be",
"hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=",
"rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8",
"url": "https://chromium.googlesource.com/chromium/src/tools"
},
"fetcher": "fetchFromGitiles"

3
pkgs/by-name/si/signal-desktop/webrtc.nix
View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "signal-webrtc";
version = finalAttrs.gclientDeps."src".path.rev;
version = finalAttrs.gclientDeps."src".path.tag;
gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json;
sourceRoot = "src";
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
"is_clang=false"
"treat_warnings_as_errors=false"
"use_llvm_libatomic=false"
"use_custom_libcxx=false"
# https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
"rtc_build_examples=false"

4
pkgs/by-name/we/wechat/package.nix
View File

@@ -30,14 +30,14 @@ let
# https://dldir1.qq.com/weixin/mac/mac-release.xml
any-darwin =
let
version = "4.1.0.19-29668";
version = "4.1.0.34-29721";
version' = lib.replaceString "-" "_" version;
in
{
inherit version;
src = fetchurl {
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw=";
hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI=";
};
};
in

4
pkgs/by-name/yt/yt-dlp/package.nix
View File

@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2025.10.14";
version = "2025.10.22";
pyproject = true;
src = fetchFromGitHub {
owner = "yt-dlp";
repo = "yt-dlp";
tag = version;
hash = "sha256-x7vpuXUihlC4jONwjmWnPECFZ7xiVAOFSDUgBNvl+aA=";
hash = "sha256-jQaENEflaF9HzY/EiMXIHgUehAJ3nnDT9IbaN6bDcac=";
};
postPatch = ''

29
pkgs/by-name/ze/zed-editor/0003-cve-2025-62518.patch Normal file
View File

@@ -0,0 +1,29 @@
diff --git a/Cargo.lock b/Cargo.lock
index bb1e8d9516..92fd68cbbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,9 +1021,9 @@ dependencies = [
[[package]]
name = "async-tar"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8"
+checksum = "d1937db2d56578aa3919b9bdb0e5100693fd7d1c0f145c53eb81fbb03e217550"
dependencies = [
"async-std",
"filetime",
diff --git a/Cargo.toml b/Cargo.toml
index 9152dfd23c..5687b08b65 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -398,7 +398,7 @@ async-dispatcher = "0.1"
async-fs = "2.1"
async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
async-recursion = "1.0.0"
-async-tar = "0.5.0"
+async-tar = "0.5.1"
async-trait = "0.1"
async-tungstenite = "0.29.1"
async-watch = "0.3.1

6
pkgs/by-name/ze/zed-editor/package.nix
View File

@@ -124,6 +124,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoPatches = [
./0002-fix-duplicate-reqwest.patch
# Upstream commit doesn't apply cleanly to 0.189.5 and we can't upgrade to newer
# releases on 25.05 as they require a newer version of the Rust compiler.
# https://github.com/zed-industries/zed/commit/4a93719b6b5666fd04cbe63fd90aba28c3547f0d
./0003-cve-2025-62518.patch
];
postPatch =
@@ -138,7 +142,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
'';
cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
cargoHash = "sha256-86Y2fyeiCYPWdg2ygt7RbUFrHVIc53yDeqvT7Unmndo=";
nativeBuildInputs = [
cmake

73
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -565,42 +565,6 @@ self: super:
# https://github.com/illia-shkroba/pfile/issues/2
pfile = doJailbreak super.pfile;
# Manually maintained
cachix-api = overrideCabal (drv: {
version = "1.7.9";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v1.7.9";
hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;
cachix = (
overrideCabal
(drv: {
version = "1.7.9";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v1.7.9";
hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
})
(
lib.pipe
(super.cachix.override {
nix = self.hercules-ci-cnix-store.nixPackage;
})
[
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.buildPackages.pkg-config)
(addBuildDepend self.hnix-store-nar)
]
)
);
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
@@ -3370,3 +3334,40 @@ self: super:
setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka);
}
)
# Cachix packages
# Manually maintained
// (
let
version = "1.9.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v${version}";
hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
};
in
{
cachix-api = overrideSrc {
inherit version;
src = src + "/cachix-api";
} super.cachix-api;
cachix = lib.pipe super.cachix [
(overrideSrc {
inherit version;
src = src + "/cachix";
})
(addBuildDepends [
self.pqueue
])
(
drv:
drv.override {
nix = self.hercules-ci-cnix-store.nixPackage;
}
)
];
}
)

7
pkgs/development/interpreters/python/python-packages-base.nix
View File

@@ -38,7 +38,12 @@ let
}
else
result
);
)
// {
# Support overriding `f` itself, e.g. `buildPythonPackage.override { }`.
# Ensure `makeOverridablePythonPackage` is applied to the result.
override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));
};
mkPythonDerivation =
if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix;

9
pkgs/development/libraries/wlroots/default.nix
View File

@@ -175,5 +175,14 @@ in
extraBuildInputs = [
lcms2
];
patches = [
(fetchpatch {
# https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5134
# > backend, output: send commit events after applying all in wlr_backend_commit()
# fixes potential crash in sway. Remove once a new release is made of wlroots
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/7392b3313a7b483c61f4fea648ba8f2aa4ce8798.patch";
sha256 = "sha256-SK463pnIX2qjwRblCJRbvJeZTL6wAXho6wBIJ10OuNk=";
})
];
};
}

14
pkgs/development/python-modules/aiotarfile/default.nix
View File

@@ -1,10 +1,8 @@
{
lib,
fetchFromGitHub,
nix-update-script,
buildPythonPackage,
unittestCheckHook,
pythonOlder,
cargo,
rustc,
rustPlatform,
@@ -12,21 +10,19 @@
buildPythonPackage rec {
pname = "aiotarfile";
version = "0.5.1";
version = "0.5.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "rhelmot";
repo = "aiotarfile";
tag = "v${version}";
hash = "sha256-DslG+XxIYb04I3B7m0fmRmE3hFCczF039QhSVdHGPL8=";
hash = "sha256-V88cvVw6ss7iiojhlqDd2frG/gCEH0YKTP0IpgeFASw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-e3NbFlBQu9QkGnIwqy2OmlQFVHjlfpMVRFWD2ADGGSc=";
hash = "sha256-Yf6N615X9ZB+HDp3xehMc3kjKbdsSbIJrqARRXwCRDQ=";
};
nativeBuildInputs = [
@@ -42,12 +38,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aiotarfile" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Stream-based, asynchronous tarball processing";
homepage = "https://github.com/rhelmot/aiotarfile";
changelog = "https://github.com/rhelmot/aiotarfile/commits/v{version}";
changelog = "https://github.com/rhelmot/aiotarfile/commits/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nicoo ];
};

48
pkgs/development/python-modules/ecdsa/default.nix
View File

@@ -1,28 +1,54 @@
{
lib,
buildPythonPackage,
fetchPypi,
pkgs,
fetchFromGitHub,
gitUpdater,
hypothesis,
openssl,
pytestCheckHook,
setuptools,
six,
}:
buildPythonPackage rec {
pname = "ecdsa";
version = "0.19.1";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-R4y6e2JVWGb8s7s/6YXgbey9to71VxPE5auYxX1QjmE=";
src = fetchFromGitHub {
owner = "tlsfuzzer";
repo = "python-ecdsa";
tag = "python-ecdsa-${version}";
hash = "sha256-PjOjHQziQ9ohXH82Ocaowj/AtsXHMHDhatFPQNccyC8=";
};
propagatedBuildInputs = [ six ];
# Only needed for tests
nativeCheckInputs = [ pkgs.openssl ];
build-system = [ setuptools ];
meta = with lib; {
dependencies = [ six ];
pythonImportsCheck = [ "ecdsa" ];
nativeCheckInputs = [
hypothesis
openssl # Only needed for tests
pytestCheckHook
];
passthru.updateScript = gitUpdater {
rev-prefix = "python-ecdsa-";
};
meta = {
changelog = "https://github.com/tlsfuzzer/python-ecdsa/blob/${src.tag}/NEWS";
description = "ECDSA cryptographic signature library";
homepage = "https://github.com/warner/python-ecdsa";
license = licenses.mit;
license = lib.licenses.mit;
knownVulnerabilities = [
# "I don't want people to use this library in production environments.
# It's a teaching tool, it's a testing tool, it's absolutely not an
# production grade implementation."
# https://github.com/tlsfuzzer/python-ecdsa/issues/330
"CVE-2024-23342"
];
};
}

7
pkgs/development/python-modules/home-assistant-chip-core/default.nix
View File

@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
aenum,
home-assistant-chip-wheels,
coloredlogs,
@@ -9,7 +8,6 @@
cryptography,
dacite,
deprecation,
ecdsa,
ipdb,
mobly,
pygobject3,
@@ -22,8 +20,6 @@ buildPythonPackage rec {
inherit (home-assistant-chip-wheels) version;
format = "wheel";
disabled = pythonOlder "3.7";
src = home-assistant-chip-wheels;
# format=wheel needs src to be a wheel not a folder of wheels
@@ -31,13 +27,12 @@ buildPythonPackage rec {
src=($src/home_assistant_chip_core*.whl)
'';
propagatedBuildInputs = [
dependencies = [
aenum
coloredlogs
construct
cryptography
dacite
ecdsa
rich
pyyaml
ipdb

3
pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
View File

@@ -138,6 +138,9 @@ stdenv.mkDerivation rec {
patch -p1 < $patch
done
# ecdsa is insecure and only used in tests
patch -p1 < ${./dont-import-ecdsa.patch}
# unpin dependencies
# there are many files to modify, in different formats
sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt

44
pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch Normal file
View File

@@ -0,0 +1,44 @@
diff --git a/src/controller/python/chip/crypto/p256keypair.py b/src/controller/python/chip/crypto/p256keypair.py
index 30198eabee..926f55318e 100644
--- a/src/controller/python/chip/crypto/p256keypair.py
+++ b/src/controller/python/chip/crypto/p256keypair.py
@@ -22,7 +22,6 @@ from ctypes import (CFUNCTYPE, POINTER, _Pointer, c_bool, c_char, c_size_t, c_ui
from typing import TYPE_CHECKING
from chip import native
-from ecdsa import ECDH, NIST256p, SigningKey # type: ignore
# WORKAROUND: Create a subscriptable pointer type (with square brackets) to ensure compliance of type hinting with ctypes
if not TYPE_CHECKING:
@@ -133,31 +132,3 @@ class P256Keypair:
format of section 2.3.3 of the SECG SEC 1 standard.
'''
raise NotImplementedError()
-
-
-class TestP256Keypair(P256Keypair):
- ''' The P256Keypair for testing purpose. It is not safe for any productions use
- '''
-
- def __init__(self, private_key: SigningKey = None):
- super().__init__()
-
- if private_key is None:
- self._key = SigningKey.generate(NIST256p)
- else:
- self._key = private_key
-
- self._pubkey = self._key.verifying_key.to_string(encoding='uncompressed')
-
- @property
- def public_key(self) -> bytes:
- return self._pubkey
-
- def ECDSA_sign_msg(self, message: bytes) -> bytes:
- return self._key.sign_deterministic(message, hashfunc=hashlib.sha256)
-
- def ECDH_derive_secret(self, remote_pubkey: bytes) -> bytes:
- ecdh = ECDH(curve=NIST256p)
- ecdh.load_private_key(self._key)
- ecdh.load_received_public_key_bytes(remote_pubkey[1:])
- return ecdh.ecdh1.generate_sharedsecret_bytes()

4
pkgs/development/python-modules/okta/default.nix
View File

@@ -6,7 +6,6 @@
fetchPypi,
flatdict,
jwcrypto,
pycryptodome,
pycryptodomex,
pydash,
pyfakefs,
@@ -15,7 +14,6 @@
pytest-mock,
pytest-recording,
pytestCheckHook,
python-jose,
pythonOlder,
pyyaml,
setuptools,
@@ -42,11 +40,9 @@ buildPythonPackage rec {
aiohttp
flatdict
jwcrypto
pycryptodome
pycryptodomex
pydash
pyjwt
python-jose
pyyaml
xmltodict
yarl

6
pkgs/development/python-modules/plugp100/default.nix
View File

@@ -9,11 +9,10 @@
aiohttp,
jsons,
requests,
cryptography,
# Test inputs
pytestCheckHook,
pyyaml,
pytest-asyncio,
async-timeout,
}:
buildPythonPackage rec {
@@ -33,15 +32,14 @@ buildPythonPackage rec {
requests
aiohttp
semantic-version
cryptography
scapy
urllib3
pyyaml
];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
async-timeout
];
disabledTestPaths = [

28
pkgs/development/python-modules/python-jose/default.nix
View File

@@ -2,39 +2,47 @@
lib,
buildPythonPackage,
cryptography,
ecdsa,
fetchFromGitHub,
pyasn1,
fetchpatch,
pycrypto,
pycryptodome,
pytestCheckHook,
rsa,
setuptools,
}:
buildPythonPackage rec {
pname = "python-jose";
version = "3.4.0";
version = "3.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mpdavis";
repo = "python-jose";
tag = version;
hash = "sha256-rPtOZ25aKIN+g3cyv8n6cNejoj3yKk4zpjdLDyEG1e4=";
hash = "sha256-8DQ0RBQ4ZgEIwcosgX3dzr928cYIQoH0obIOgk0+Ozs=";
};
pythonRelaxDeps = [
# https://github.com/mpdavis/python-jose/pull/376
patches = [
# https://github.com/mpdavis/python-jose/pull/393
(fetchpatch {
name = "fix-test_incorrect_public_key_hmac_signing.patch";
url = "https://github.com/mpdavis/python-jose/commit/7c0e4c6640bdc9cd60ac66d96d5d90f4377873db.patch";
hash = "sha256-bCzxZEWKYD20TLqzVv6neZlpU41otbVqaXc7C0Ky9BQ=";
})
];
pythonRemoveDeps = [
# These aren't needed if the cryptography backend is used:
# https://github.com/mpdavis/python-jose/blob/3.5.0/README.rst#cryptographic-backends
"ecdsa"
"pyasn1"
"rsa"
];
build-system = [ setuptools ];
dependencies = [
ecdsa
pyasn1
rsa
cryptography
];
optional-dependencies = {

35
pkgs/development/python-modules/scapy/default.nix
View File

@@ -4,25 +4,15 @@
stdenv,
lib,
isPyPy,
pycrypto,
ecdsa, # TODO
mock,
python-can,
brotli,
withOptionalDeps ? true,
tcpdump,
ipython,
withCryptography ? true,
cryptography,
withVoipSupport ? true,
sox,
withPlottingSupport ? true,
matplotlib,
withGraphicsSupport ? false,
pyx,
texliveBasic,
graphviz,
imagemagick,
withManufDb ? false,
wireshark,
libpcap,
@@ -63,22 +53,15 @@ buildPythonPackage rec {
buildInputs = lib.optional withVoipSupport sox;
propagatedBuildInputs = [
pycrypto
ecdsa
]
++ lib.optionals withOptionalDeps [
tcpdump
ipython
]
++ lib.optional withCryptography cryptography
++ lib.optional withPlottingSupport matplotlib
++ lib.optionals withGraphicsSupport [
pyx
texliveBasic
graphviz
imagemagick
];
optional-dependencies = {
all = [
cryptography
ipython
matplotlib
pyx
];
cli = [ ipython ];
};
# Running the tests seems too complicated:
doCheck = false;

23
pkgs/development/python-modules/sshpubkeys/default.nix
View File

@@ -2,31 +2,36 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
cryptography,
ecdsa,
}:
buildPythonPackage rec {
version = "3.3.1";
format = "setuptools";
pname = "sshpubkeys";
pyproject = true;
src = fetchFromGitHub {
owner = "ojarva";
repo = "python-${pname}";
rev = version;
sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4";
repo = "python-sshpubkeys";
# https://github.com/ojarva/python-sshpubkeys/issues/94
tag = "v3.2.0";
hash = "sha256-2OJatnQuCt9XQ797F5nEmgEZl5/tu9lrAry5yBGW61g=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
cryptography
ecdsa
];
meta = with lib; {
pythonImportsCheck = [ "sshpubkeys" ];
meta = {
changelog = "https://github.com/ojarva/python-sshpubkeys/releases/tag/${src.tag}";
description = "OpenSSH Public Key Parser for Python";
homepage = "https://github.com/ojarva/python-sshpubkeys";
license = licenses.bsd3;
license = lib.licenses.bsd3;
maintainers = [ ];
};
}

10
pkgs/development/web/nodejs/nodejs.nix
View File

@@ -428,6 +428,9 @@ let
# Those are annoyingly flaky, but not enough to be marked as such upstream.
"test-wasi"
# This is failing on newer macOS versions, no fix has yet been provided upstream:
"test-cluster-dgram-1"
]
++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
# These tests fail on x86_64-darwin (even without sandbox).
@@ -442,10 +445,9 @@ let
]
# Those are annoyingly flaky, but not enough to be marked as such upstream.
++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
++ lib.optionals (majorVersion == "22" && stdenv.buildPlatform.isDarwin) [
"test-cluster-dgram-1"
"test/sequential/test-http-server-request-timeouts-mixed.js"
]
++ lib.optional (
majorVersion == "22" && stdenv.buildPlatform.isDarwin
) "test/sequential/test-http-server-request-timeouts-mixed.js"
)
}"
];

12
pkgs/development/web/nodejs/v24.nix
View File

@@ -17,8 +17,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "24.9.0";
sha256 = "f17bc4cb01f59098c34a288c1bb109a778867c14eeb0ebbd608d0617b1193bbf";
version = "24.10.0";
sha256 = "f17e36cb2cc8c34a9215ba57b55ce791b102e293432ed47ad63cbaf15f78678f";
patches =
(
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -59,6 +59,14 @@ buildNodejs {
includes = [ "tools/gyp/pylib/gyp/xcode_emulation.py" ];
revert = true;
})
(fetchpatch2 {
url = "https://github.com/nodejs/node/commit/886e4b3b534a9f3ad2facbc99097419e06615900.patch?full_index=1";
hash = "sha256-DJTH8wVAAnoCTsUhYjsr1DV/EhFaduDpzETfer7WUL0=";
stripLen = 2;
extraPrefix = "deps/npm/node_modules/node-gyp/";
includes = [ "deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py" ];
revert = true;
})
./bypass-darwin-xcrun-node16.patch
]
++ lib.optionals (!stdenv.buildPlatform.isDarwin) [

17
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -25,23 +25,18 @@
"lts": true
},
"6.6": {
"version": "6.6.113",
"hash": "sha256:07n494cblmlfmn8l3kjalwlnb1f9xxxf8c31kkfr5lb1wk9cz58z",
"version": "6.6.114",
"hash": "sha256:0z5r1kmzf3ib0r5rbcmp3cgjyagf6wgdjynpjbhkm5727jh7ahfa",
"lts": true
},
"6.12": {
"version": "6.12.54",
"hash": "sha256:0qny8c4r9rf55bvchs5vjplfldngmydn0j47a97c9vpgj0rws38v",
"version": "6.12.55",
"hash": "sha256:17zv8ail05wnbfl9yhgs4llapyk3f6qjjbfqbwx0clx61138z3rj",
"lts": true
},
"6.16": {
"version": "6.16.12",
"hash": "sha256:0vm257d76hmimnac8hzg66gd1mdg330sai39lywfn4m9bjydx93w",
"lts": false
},
"6.17": {
"version": "6.17.4",
"hash": "sha256:1nwi0hzikziwkxm9xzf819wb3lsz93i1ns1nzybpbfkgdqli42h1",
"version": "6.17.5",
"hash": "sha256:1kibm4b3dvncw8dzxllxiza0923q6f2xlsng4gkln5n2x4vaypy0",
"lts": false
}
}

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "5.10.240-rt134"; # updated by ./update-rt.sh
version = "5.10.245-rt139"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -25,7 +25,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
sha256 = "17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk";
};
kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
sha256 = "1nqdshpcf775cmb1kqcq939b7qx6wsy91pf0l0vsd3rdpixidzyk";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "5.15.189-rt87"; # updated by ./update-rt.sh
version = "5.15.195-rt90"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
sha256 = "0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
sha256 = "15n1l3b0yq7hl2zady3s3a3zym82clyycvf5icavvd68758sdp25";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "6.1.146-rt53"; # updated by ./update-rt.sh
version = "6.1.156-rt56"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
sha256 = "13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
sha256 = "1smah5wa4lrgb13li025lpj80yxay4g13m7c4i09whxcgxhc294k";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "6.6.101-rt59"; # updated by ./update-rt.sh
version = "6.6.112-rt63"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
sha256 = "08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
sha256 = "01z2dwl54hfqfyc8xmlz6kaw522s55jsdrdw31pjnzkn6rxf7zbf";
};
};
in

72
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -15,14 +15,14 @@ let
variants = {
# ./update-xanmod.sh lts
lts = {
version = "6.12.54";
hash = "sha256-8ZeVHP8voR4GJfBB1iM8ZDx4QgCd83tJ7IkpJNW63ME=";
version = "6.12.55";
hash = "sha256-JxCRiUw8dwxsEhPrvNRRRRvVSTE6JFluLRZZ4C2yoqo=";
isLTS = true;
};
# ./update-xanmod.sh main
main = {
version = "6.17.4";
hash = "sha256-UHfZwK0qIVhiKw8OpE8i+V2BRav6Fsju8E5rO5WRwVA=";
version = "6.17.5";
hash = "sha256-w07UZmKXZ59h5DVzqH2ECzIMmeXyLfrq83FcTN5TVXo=";
};
};
@@ -47,32 +47,52 @@ let
inherit hash;
};
structuredExtraConfig = with lib.kernel; {
# CPUFreq governor Performance
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
structuredExtraConfig =
with lib.kernel;
{
# CPUFreq governor Performance
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
# Full preemption
PREEMPT = lib.mkOverride 60 yes;
PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
# Preemption
PREEMPT = lib.mkOverride 60 yes;
PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
# Preemptive Full Tickless Kernel at 250Hz
HZ = freeform "250";
HZ_250 = yes;
HZ_1000 = no;
# Preemptive tickless idle kernel
HZ = freeform "250";
HZ_250 = yes;
NO_HZ = no;
NO_HZ_FULL = lib.mkOverride 60 no;
NO_HZ_IDLE = yes;
# RCU_BOOST and RCU_EXP_KTHREAD
RCU_EXPERT = yes;
RCU_FANOUT = freeform "64";
RCU_FANOUT_LEAF = freeform "16";
RCU_BOOST = yes;
RCU_BOOST_DELAY = freeform "0";
RCU_EXP_KTHREAD = yes;
};
# CPU idle governors favored
CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled
CPU_IDLE_GOV_LADDER = yes;
CPU_IDLE_GOV_TEO = yes;
# RCU_BOOST and RCU_EXP_KTHREAD
RCU_EXPERT = yes;
RCU_FANOUT = freeform "64";
RCU_FANOUT_LEAF = freeform "16";
RCU_BOOST = yes;
RCU_BOOST_DELAY = freeform "0";
RCU_EXP_KTHREAD = yes;
RCU_NOCB_CPU = yes;
RCU_DOUBLE_CHECK_CB_TIME = yes;
# x86 features
X86_FRED = yes;
X86_POSTED_MSI = yes;
}
// lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor version) "6.13") {
# Lazy preemption
PREEMPT = lib.mkOverride 70 no;
PREEMPT_LAZY = yes;
};
extraPassthru.updateScript = [
./update-xanmod.sh

16
pkgs/servers/monitoring/grafana/default.nix
View File

@@ -28,23 +28,23 @@ let
patchGoVersion = ''
find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -and -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
substituteInPlace "$line" \
--replace-fail "go 1.24.6" "go 1.24.0"
--replace-fail "go 1.25.3" "go 1.25.0"
done
find . -name go.mod -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
substituteInPlace "$line" \
--replace-fail "go 1.24.5" "go 1.24.0"
--replace-fail "go 1.25.3" "go 1.25.0"
done
find . -name go.work -print0 | while IFS= read -r -d ''' line; do
substituteInPlace "$line" \
--replace-fail "go 1.24.6" "go 1.24.0"
--replace-fail "go 1.25.3" "go 1.25.0"
done
substituteInPlace Makefile \
--replace-fail "GO_VERSION = 1.24.6" "GO_VERSION = 1.24.0"
--replace-fail "GO_VERSION = 1.25.3" "GO_VERSION = 1.25.0"
'';
in
buildGoModule rec {
pname = "grafana";
version = "12.0.5";
version = "12.0.6";
subPackages = [
"pkg/cmd/grafana"
@@ -56,7 +56,7 @@ buildGoModule rec {
owner = "grafana";
repo = "grafana";
rev = "v${version}";
hash = "sha256-60E/YOW7jlwss0+lvP5twM5xTBW3NM2FzUAnxZcWTJY=";
hash = "sha256-VvySbS5c4jYsSEDRDlifOCNIDgoIQGGobDRHxAASXVY=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -70,14 +70,14 @@ buildGoModule rec {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit src missingHashes;
hash = "sha256-qarRn9m12mthKiaTJGpQI4sLadqJm71X9tUfqRbLo2Y=";
hash = "sha256-60I2rAdl5KczfvGevkoP2ahmV9r1Hm30zM2mA9jVdl4=";
};
disallowedRequisites = [ offlineCache ];
postPatch = patchGoVersion;
vendorHash = "sha256-BtXwPQThXShORrp7TkOfrvcq5ajrkaBxxUceJtjJSNo=";
vendorHash = "sha256-x9howXCPl/gSQSm1P5VmDbYzoPP2Nzx5WA0ERNqm4As=";
proxyVendor = true;

4
pkgs/servers/monitoring/zabbix/versions.nix
View File

@@ -4,8 +4,8 @@ generic: {
hash = "sha256-US+TP6qtCT3LlnELWR93t7nf8A1Y1xRPI+300GA1v8g=";
};
v70 = generic {
version = "7.0.16";
hash = "sha256-puolxEye+RpDJcyobH8UFaiWRE9ECbHLY5b2i5NW0WM=";
version = "7.0.19";
hash = "sha256-ML7wFzSTsZk3fJBhs06KLhaijrDW9+nHuUJDPkt1Nn8=";
};
v60 = generic {
version = "6.0.36";

5
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@@ -84,6 +84,9 @@ stdenv.mkDerivation rec {
./gsutil-disable-updates.patch
];
# Prevent Python from writing bytecode to ensure build determinism
PYTHONDONTWRITEBYTECODE = "1";
installPhase = ''
runHook preInstall
@@ -158,8 +161,6 @@ stdenv.mkDerivation rec {
installCheckPhase = ''
# Avoid trying to write logs to homeless-shelter
export HOME=$(mktemp -d)
# Prevent Python from writing bytecode to ensure build determinism
export PYTHONDONTWRITEBYTECODE=1
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
$out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)"
'';

5
pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
View File

@@ -78,11 +78,12 @@ symlinkJoin {
]
++ comps;
# Prevent Python from writing bytecode to ensure build determinism
PYTHONDONTWRITEBYTECODE = "1";
postBuild = ''
sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
# Prevent Python from writing bytecode to ensure build determinism
export PYTHONDONTWRITEBYTECODE=1
${installCheck}
'';
}

8
pkgs/tools/admin/meshcentral/default.nix
View File

@@ -8,11 +8,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.49";
version = "1.1.51";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.49.tgz";
sha256 = "1xklg7snn3qlmakkqy89q58n7b09idxz0zz5ha3hrn8s0wcmjakr";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.51.tgz";
sha256 = "1l3x1rhcw38pg0rh27qyfg2dm5biwnyzicdd6l07c3km4x6xi5pr";
};
patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-xiZ1RL4GsihQc1yazjkTfge/DS2N9oimSl0EZr6WmrM=";
hash = "sha256-jmsRlHJgSrUtXwRcfX+tMH4SmrKVtD7gEK1+oW5mYIs=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

6
pkgs/tools/admin/meshcentral/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.49",
"version": "1.1.51",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@@ -73,7 +73,7 @@
"jwt-simple": "*",
"openid-client": "5.7.1",
"passport-saml": "*",
"@duosecurity/duo_universal": "*",
"@duosecurity/duo_universal": "2.1.0",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
@@ -122,7 +122,7 @@
"webdav": "5.8.0",
"minio": "8.0.2",
"wildleek": "2.0.0",
"yubikeyotp": "0.2.0",
"yub": "0.11.1",
"otplib": "12.0.1",
"twilio": "4.19.0",
"plivo": "4.58.0",

1734
pkgs/tools/admin/meshcentral/yarn.lock
View File

File diff suppressed because it is too large Load Diff

4
pkgs/top-level/all-packages.nix
View File

@@ -10427,7 +10427,9 @@ with pkgs;
glabels-qt = callPackage ../applications/graphics/glabels-qt { };
grafana = callPackage ../servers/monitoring/grafana { };
grafana = callPackage ../servers/monitoring/grafana {
buildGoModule = buildGo125Module;
};
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
hasura-cli = callPackage ../servers/hasura/cli.nix { };

11
pkgs/top-level/linux-kernels.nix
View File

@@ -211,14 +211,6 @@ in
];
};
linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.16";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.17";
kernelPatches = [
@@ -320,6 +312,7 @@ in
linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
@@ -752,7 +745,6 @@ in
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17);
}
// lib.optionalAttrs config.allowAliases {
@@ -763,6 +755,7 @@ in
linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
};
rtPackages = {