Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-01-21 18:05:23 +00:00
committed by GitHub
81 changed files with 1744 additions and 6208 deletions

View File

@@ -10792,6 +10792,12 @@
githubId = 1476865;
name = "jigglycrumb";
};
jinser = {
name = "Jinser Kafka";
email = "aimer@purejs.icu";
github = "jetjinser";
githubId = 46820840;
};
jiriks74 = {
name = "Jiří Štefka";
email = "jiri@stefka.eu";
@@ -22909,6 +22915,13 @@
name = "Rouven Seifert";
keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; } ];
};
theredstonedev = {
email = "theredstonedev@devellight.space";
matrix = "@theredstonedev_de:matrix.devellight.space";
github = "TheRedstoneDEV-DE";
githubId = 75328096;
name = "Robert Richter";
};
therishidesai = {
email = "desai.rishi1@gmail.com";
github = "therishidesai";

View File

@@ -90,35 +90,79 @@ def make_command(args: list) -> str:
return " ".join(map(shlex.quote, (map(str, args))))
def _preprocess_screenshot(screenshot_path: str, negate: bool = False) -> str:
magick_args = [
"-filter",
"Catrom",
"-density",
"72",
"-resample",
"300",
"-contrast",
"-normalize",
"-despeckle",
"-type",
"grayscale",
"-sharpen",
"1",
"-posterize",
"3",
"-gamma",
"100",
"-blur",
"1x65535",
]
out_file = screenshot_path
if negate:
magick_args.append("-negate")
out_file += ".negative"
out_file += ".png"
ret = subprocess.run(
["magick", "convert"] + magick_args + [screenshot_path, out_file],
capture_output=True,
)
if ret.returncode != 0:
raise Exception(
f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}"
)
return out_file
def _perform_ocr_on_screenshot(
screenshot_path: str, model_ids: Iterable[int]
) -> list[str]:
if shutil.which("tesseract") is None:
raise Exception("OCR requested but enableOCR is false")
magick_args = (
"-filter Catrom -density 72 -resample 300 "
+ "-contrast -normalize -despeckle -type grayscale "
+ "-sharpen 1 -posterize 3 -negate -gamma 100 "
+ "-blur 1x65535"
)
tess_args = "-c debug_file=/dev/null --psm 11"
cmd = f"magick convert {magick_args} '{screenshot_path}' '{screenshot_path}.png'"
ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0:
raise Exception(
f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}"
)
processed_image = _preprocess_screenshot(screenshot_path, negate=False)
processed_negative = _preprocess_screenshot(screenshot_path, negate=True)
model_results = []
for model_id in model_ids:
cmd = f"tesseract '{screenshot_path}.png' - {tess_args} --oem '{model_id}'"
ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0:
raise Exception(f"OCR failed with exit code {ret.returncode}")
model_results.append(ret.stdout.decode("utf-8"))
for image in [screenshot_path, processed_image, processed_negative]:
for model_id in model_ids:
ret = subprocess.run(
[
"tesseract",
image,
"-",
"--oem",
str(model_id),
"-c",
"debug_file=/dev/null",
"--psm",
"11",
],
capture_output=True,
)
if ret.returncode != 0:
raise Exception(f"OCR failed with exit code {ret.returncode}")
model_results.append(ret.stdout.decode("utf-8"))
return model_results

View File

@@ -81,6 +81,10 @@ let
"${config.i18n.glibcLocales}"
]
++ mapAttrsToList (name: inbox: inbox.description) cfg.inboxes
++ filter (x: x != null) [
cfg.${proto}.cert or null
cfg.${proto}.key or null
]
++
# Without confinement the whole Nix store
# is made available to the service

View File

@@ -228,7 +228,7 @@ in
sed -i "s/^hs_token:.*$/$hs_token/g" ${registrationFile}
sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile}
fi
if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}"]; then
if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}" ]; then
${lib.getExe pkgs.nodejs} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}"
fi
# Allow synapse access to the registration

View File

@@ -22,6 +22,8 @@
user = "alice";
};
programs.ydotool.enable = true;
services.xserver.enable = true;
services.displayManager.defaultSession = lib.mkForce "miracle-wm";
@@ -59,7 +61,7 @@
];
# To help with OCR
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {
main = {
font = "inconsolata:size=16";
};
@@ -69,7 +71,7 @@
regular2 = foreground;
};
};
etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {
etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {
font = rec {
normal.family = "Inconsolata";
bold.family = normal.family;
@@ -114,7 +116,17 @@
machine.wait_for_file("/tmp/test-wayland-exit-ok")
machine.copy_from_vm("/tmp/test-wayland.out")
machine.screenshot("foot_wayland_info")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.send_chars("exit\n")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.wait_until_fails("pgrep foot")
# Test XWayland
@@ -125,7 +137,17 @@
machine.wait_for_file("/tmp/test-x11-exit-ok")
machine.copy_from_vm("/tmp/test-x11.out")
machine.screenshot("alacritty_glinfo")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.send_chars("exit\n")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.wait_until_fails("pgrep alacritty")
'';
}

View File

@@ -23,6 +23,8 @@ import ./make-test-python.nix (
user = "alice";
};
programs.ydotool.enable = true;
services.xserver.enable = true;
services.displayManager.defaultSession = lib.mkForce "miriway";
@@ -55,7 +57,7 @@ import ./make-test-python.nix (
];
# To help with OCR
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {
main = {
font = "inconsolata:size=16";
};
@@ -65,7 +67,7 @@ import ./make-test-python.nix (
regular2 = foreground;
};
};
etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {
etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {
font = rec {
normal.family = "Inconsolata";
bold.family = normal.family;
@@ -109,10 +111,18 @@ import ./make-test-python.nix (
machine.wait_for_file("/tmp/test-wayland-exit-ok")
machine.copy_from_vm("/tmp/test-wayland.out")
machine.screenshot("foot_wayland_info")
# Only succeeds when a mouse is moved inside an interactive session?
# machine.send_chars("exit\n")
# machine.wait_until_fails("pgrep foot")
machine.succeed("pkill foot")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.send_chars("exit\n")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.wait_until_fails("pgrep foot")
# Test XWayland
machine.send_key("ctrl-alt-a")
@@ -121,10 +131,18 @@ import ./make-test-python.nix (
machine.wait_for_file("/tmp/test-x11-exit-ok")
machine.copy_from_vm("/tmp/test-x11.out")
machine.screenshot("alacritty_glinfo")
# Only succeeds when a mouse is moved inside an interactive session?
# machine.send_chars("exit\n")
# machine.wait_until_fails("pgrep alacritty")
machine.succeed("pkill alacritty")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.send_chars("exit\n")
# please actually register that we want to close the window
machine.succeed("ydotool mousemove -- 10 10")
machine.sleep(3)
machine.wait_until_fails("pgrep alacritty")
'';
}
)

View File

@@ -9,6 +9,13 @@ import ./make-test-python.nix (
-subj '/CN=machine.${domain}'
install -D -t $out key.pem cert.pem
'';
# Git repositories paths in Gitolite.
# Here only their baseNameOf is used for configuring public-inbox inboxes.
gitRepositories = [
"user/repo1"
"user/repo2"
];
in
{
name = "public-inbox";
@@ -23,13 +30,7 @@ import ./make-test-python.nix (
...
}:
let
inherit (config.services) gitolite public-inbox;
# Git repositories paths in Gitolite.
# Only their baseNameOf is used for configuring public-inbox.
repositories = [
"user/repo1"
"user/repo2"
];
inherit (config.services) public-inbox;
in
{
virtualisation.diskSize = 1 * 1024;
@@ -80,7 +81,7 @@ import ./make-test-python.nix (
};
inboxes =
lib.recursiveUpdate
(lib.genAttrs (map baseNameOf repositories) (repo: {
(lib.genAttrs (map baseNameOf gitRepositories) (repo: {
address = [
# Routed to the "public-inbox:" transport in services.postfix.transport
"${repo}@${domain}"
@@ -104,24 +105,15 @@ import ./make-test-python.nix (
};
settings.coderepo = lib.listToAttrs (
map (
path:
lib.nameValuePair (baseNameOf path) {
dir = "/var/lib/gitolite/repositories/${path}.git";
cgitUrl = "https://git.${domain}/${path}.git";
repositoryName:
lib.nameValuePair (baseNameOf repositoryName) {
dir = "/var/lib/public-inbox/repositories/${repositoryName}.git";
cgitUrl = "https://git.${domain}/${repositoryName}.git";
}
) repositories
) gitRepositories
);
};
# Use gitolite to store Git repositories listed in coderepo entries
services.gitolite = {
enable = true;
adminPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJmoTOQnGqX+//us5oye8UuE+tQBx9QEM7PN13jrwgqY root@localhost";
};
systemd.services.public-inbox-httpd = {
serviceConfig.SupplementaryGroups = [ gitolite.group ];
};
# Use nginx as a reverse proxy for public-inbox-httpd
services.nginx = {
enable = true;
@@ -181,6 +173,7 @@ import ./make-test-python.nix (
};
environment.systemPackages = [
pkgs.gitMinimal
pkgs.mailutils
pkgs.openssl
];
@@ -189,19 +182,22 @@ import ./make-test-python.nix (
testScript = ''
start_all()
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("public-inbox-init.service")
# Very basic check that Gitolite can work;
# Gitolite is not needed for the rest of this testScript
machine.wait_for_unit("gitolite-init.service")
machine.succeed(
${lib.concatMapStrings (repositoryName: ''
"sudo -u public-inbox git init --bare -b main /var/lib/public-inbox/repositories/${repositoryName}.git",
'') gitRepositories}
)
# List inboxes through public-inbox-httpd
machine.wait_for_unit("public-inbox-httpd.socket")
machine.wait_for_unit("nginx.service")
machine.succeed("curl -L https://machine.${domain} | grep repo1@${domain}")
# The repo2 inbox is hidden
machine.fail("curl -L https://machine.${domain} | grep repo2@${domain}")
machine.wait_for_unit("public-inbox-httpd.service")
# Send a mail and read it through public-inbox-httpd
# Must work too when using a recipientDelimiter.
@@ -220,8 +216,7 @@ import ./make-test-python.nix (
machine.succeed("curl -L 'https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u' | grep 'This is a testing mail.'")
# Read a mail through public-inbox-imapd
machine.wait_for_open_port(993)
machine.wait_for_unit("public-inbox-imapd.service")
machine.wait_for_unit("public-inbox-imapd.socket")
machine.succeed("openssl s_client -ign_eof -crlf -connect machine.${domain}:993 <${pkgs.writeText "imap-commands" ''
tag login anonymous@${domain} anonymous
tag SELECT INBOX.comp.${orga}.repo1.0
@@ -230,8 +225,7 @@ import ./make-test-python.nix (
''} | grep '^Message-ID: <repo1@root-1>'")
# TODO: Read a mail through public-inbox-nntpd
#machine.wait_for_open_port(563)
#machine.wait_for_unit("public-inbox-nntpd.service")
#machine.wait_for_unit("public-inbox-nntpd.socket")
# Delete a mail.
# Note that the use of an extension not listed in the addresses

View File

@@ -29,15 +29,15 @@
stdenv.mkDerivation rec {
pname = "csound";
version = "6.18.1";
version = "6.18.1-unstable-2024-07-02";
hardeningDisable = [ "format" ];
src = fetchFromGitHub {
owner = "csound";
repo = "csound";
rev = version;
sha256 = "sha256-O7s92N54+zIl07eIdK/puoSve/qJ3O01fTh0TP+VdZA=";
rev = "2536da284dd70ec7272040cb0763f70ae57123c4";
sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI=";
};
cmakeFlags =

View File

@@ -1,17 +1,51 @@
{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5 }:
{
stdenv,
lib,
pkg-config,
fetchurl,
cmake,
libjack2,
alsa-lib,
libsndfile,
liblo,
lv2,
qt6,
xorg,
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "drumkv1";
version = "0.9.23";
version = "1.0.0";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
sha256 = "sha256-gNscsqGpEfU1CNJDlBAzum9M0vzJSm6Wx5b/zhOt+sk=";
url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz";
hash = "sha256-vi//84boqaVxC/KCg+HF76vB4Opch02LU4RtbVaxaX4=";
};
buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
buildInputs = [
libjack2
alsa-lib
libsndfile
liblo
lv2
xorg.libX11
qt6.qtbase
qt6.qtwayland
qt6.qtsvg
];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
cmake
qt6.wrapQtAppsHook
];
cmakeFlags = [
# disable experimental feature "LV2 port change request"
"-DCONFIG_LV2_PORT_CHANGE_REQUEST=false"
# override libdir -- temporary until upstream fixes CMakeLists.txt
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = with lib; {
description = "Old-school drum-kit sampler synthesizer with stereo fx";
@@ -19,6 +53,6 @@ mkDerivation rec {
homepage = "http://drumkv1.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ ];
maintainers = [ maintainers.theredstonedev ];
};
}

View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "134.0.1";
version = "134.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3f40ca5a753a66e08af4e8b12d75feab67b0567ecffd34f5cf013f49aeb809ccd458c8011e9456dc902c24eaf626078117874514eb40cee5574eafce93ee772d";
sha512 = "74d631ecbdb5607cfcc4de408947b3b129e36b3d1daa501827aebc81f48c878f9bade875875c466c07c651f26b5388ff2d2d2087e66e0613d8914abaa7ddf5ae";
};
meta = {

View File

@@ -9,15 +9,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.16.4";
version = "3.17.0";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-1dgBPDl5AtbqSKzfbAnCAzdBL+d6ZeO81LJFosmO7Bg=";
sha256 = "sha256-kLiYzZFqJQGkqpjFPTB9BHQf7yWiWRUvWDpF5WkfJEU=";
};
vendorHash = "sha256-pkQ4J4JmEByu7bkUa/rg2bipY9s6t6uvPNiNyTyYkD8=";
vendorHash = "sha256-mARUYjnbn5dmR0cKAXiHFJcYNx1ROabLv9Z7KCY9PRM=";
subPackages = [ "cmd/helm" ];
ldflags = [

View File

@@ -21,13 +21,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.32.0";
version = "1.32.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
hash = "sha256-VpinMMWvFYpcqDC9f3q/oEqUHRz7thHMs0bKt6AaNms=";
hash = "sha256-6KZlbwSMmFvh6XKJR1W/qa3xU0O3fuQaMW/P5An/AtQ=";
};
vendorHash = null;

View File

@@ -31,7 +31,7 @@
};
})
orig.realBuilder or stdenv.shell
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
] ++ orig.args or ["-e" ../../stdenv/generic/source-stdenv.sh (orig.builder or ../../stdenv/generic/default-builder.sh)];
});
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation

View File

@@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r"
# -----------------------------------------
# Write the build log to the default output
# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/default-builder.sh
# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/source-stdenv.sh
#
# We need this so that we can read $outputs when `__structuredAttrs` is enabled
#

View File

@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "abcmidi";
version = "2024.12.16";
version = "2025.01.20";
src = fetchFromGitHub {
owner = "sshlien";
repo = "abcmidi";
tag = finalAttrs.version;
hash = "sha256-8kzgojLwVVFjpWiQ1/0S3GCVU8oEpoFItjtRDByauDg=";
hash = "sha256-QFtxiIx5MxzMK7QWqVC9xq4SQ44Ba210WEBP7M+QRxo=";
};
meta = {

View File

@@ -15,11 +15,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "angular-language-server";
version = "19.0.3";
version = "19.0.4";
src = fetchurl {
name = "angular-language-server-${finalAttrs.version}.zip";
url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
hash = "sha256-QVvXwzSaj5wMYEwMMXGJwRwg7v6HdB0JKLkQiUNR0y4=";
hash = "sha256-0vED1AcNIbZ7SmXn4KaBBajxfAptQg+XKL3NtJfnvG8=";
};
nativeBuildInputs = [

View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.11.31";
version = "0.11.32";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
hash = "sha256-MFce+stC+OzUL0H0ahZZAfMwr9Y+EVJIMmhhRl4JYaU=";
hash = "sha256-HbIV5eQES3K2wBEPLW1w41y3BPGh4fbkTxA0MpKh9x0=";
};
env.CGO_ENABLED = 0;

View File

@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "2.0.7";
version = "2.0.8";
platform =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"sha256-ztQEzW8bGhTURPpZmYcax8Ms2HJ78XkgEfdFBUQ6rLQ="
"sha256-ItPt5qjfRgtPNg6a/Zlc0ASfdvGXMMKV7SqNEOQ9u28="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
"sha256-t/+TnMSkJCLYM0nqJVBzdpARqPHB3ojRQZ8iPp0EPlM="
"sha256-zUSDUwZY1id/WFuC87Wa4eB48X4rmXvVC1/b2v5bhw4="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
"sha256-qnyZxE/Bt+tXz08N60BQaLn7zzGE5eV/5mJ/BHHE8nU="
"sha256-1wsGL1G8/+xMvYNwe7EOyqEuEKDKiwA7yyyjfbGgxJQ="
else
throw "unsupported platform";
};

View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "cf-terraforming";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cf-terraforming";
rev = "v${version}";
sha256 = "sha256-fJ3TgdEv9vk5HUUG+0cqYuA4fjXq5Smjf/KAILT9/AU=";
sha256 = "sha256-vWsA/VNtQvnrypcBB/5CJbiHEvnYkjuesdkq4soTMVM=";
};
vendorHash = "sha256-NNeJ6QfTV8X3WIFge+Ln38ym9uagLl3IpNWuPqMjeBA=";
vendorHash = "sha256-eTc9K9EXlWmj1YAcOOEIUwELq6szLsj1zYj44VTvquw=";
ldflags = [
"-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}"
];

View File

@@ -0,0 +1,53 @@
{ pkgs, lib, cmake, ninja, sphinx, python3Packages, ... }:
pkgs.stdenv.mkDerivation {
pname = "ckdl";
version = "1.0";
src = pkgs.fetchFromGitHub {
owner = "tjol";
repo = "ckdl";
tag = "1.0";
hash = "sha256-qEfRZzoUQZ8umdWgx+N4msjPBbuwDtkN1kNDfZicRjY=";
};
outputs = [ "bin" "dev" "lib" "doc" "out" ];
nativeBuildInputs = [
cmake
ninja
sphinx
python3Packages.furo
];
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTS" true)
];
postPatch = ''
cd doc
make singlehtml
mkdir -p $doc/share/doc
mv _build/singlehtml $doc/share/doc/ckdl
cd ..
'';
postInstall = ''
mkdir -p $bin/bin
# some tools that are important for debugging.
# idk why they are not copied to bin by cmake, but I’m too tired to figure it out
install src/utils/ckdl-tokenize $bin/bin
install src/utils/ckdl-parse-events $bin/bin
install src/utils/ckdl-cat $bin/bin
touch $out
'';
meta = {
description = "ckdl is a C (C11) library that implements reading and writing the KDL Document Language.";
license = lib.licenses.mit;
platforms = lib.platforms.all;
};
}

View File

@@ -0,0 +1,40 @@
diff --git a/src/utils/help.rs b/src/utils/help.rs
index 9b0bc6a7..471b2adc 100644
--- a/src/utils/help.rs
+++ b/src/utils/help.rs
@@ -201,16 +201,6 @@ macro_rules! t {
};
}
-/// 将字节数转换为可读的流量字符串
-/// 支持 B/s、KB/s、MB/s、GB/s 的自动转换
-///
-/// # Examples
-/// ```
-/// assert_eq!(format_bytes_speed(1000), "1000B/s");
-/// assert_eq!(format_bytes_speed(1024), "1.0KB/s");
-/// assert_eq!(format_bytes_speed(1024 * 1024), "1.0MB/s");
-/// ```
-#[cfg(target_os = "macos")]
pub fn format_bytes_speed(speed: u64) -> String {
if speed < 1024 {
format!("{}B/s", speed)
@@ -222,6 +212,15 @@ pub fn format_bytes_speed(speed: u64) -> String {
format!("{:.1}GB/s", speed as f64 / 1024.0 / 1024.0 / 1024.0)
}
}
+/// 将字节数转换为可读的流量字符串
+/// 支持 B/s、KB/s、MB/s、GB/s 的自动转换
+///
+/// # Examples
+/// ```
+/// assert_eq!(format_bytes_speed(1000), "1000B/s");
+/// assert_eq!(format_bytes_speed(1024), "1.0KB/s");
+/// assert_eq!(format_bytes_speed(1024 * 1024), "1.0MB/s");
+/// ```
#[test]
fn test_format_bytes_speed() {
--
2.47.0

View File

@@ -14,23 +14,23 @@
}:
let
pname = "clash-verge-rev";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-rev";
tag = "v${version}";
hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w=";
hash = "sha256-vHXXFHdKETJBlzbf4sU+gZpDz06My9DCx5nWdMpHmyc=";
};
src-service = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-service";
rev = "8b676086f2770e213cffea08ef31b54b886f8f11"; # no meaningful tags in this repo. The only way is updating manully every time.
hash = "sha256-vF26Bp52y2kNHwwtBjy3Of75qJpTriqvul29KmudHww=";
rev = "7f8ad08c2f716ca50c074ecd37967728e08edf1e"; # no meaningful tags in this repo. The only way is updating manully every time.
hash = "sha256-kZf5O3n0xmNUN0G4hAWQDN9Oj9K7PtLpv6jnhh1C5Hg=";
};
service-cargo-hash = "sha256-pMOCifffUyBkcXC8inZFZeZVHeaOt0LAu2jZUGQ7QdM=";
service-cargo-hash = "sha256-uo/2QBsZzoTdwRiW0Kr7GGiQCpQH4lW4h5XHqWd5sTU=";
service = callPackage ./service.nix {
inherit
@@ -52,8 +52,8 @@ let
;
};
npm-hash = "sha256-zsgZhLC+XUzlCUKKGAJV5MlSpWsoLmAgMwKkmAkAX9Q=";
vendor-hash = "sha256-fk3OdJ1CKNHkeUjquJtJgM7PDyPpQ7tssDnFZHMbQHI=";
npm-hash = "sha256-vpa8WyOMOH02g2gxibJmav9yWS3QLhaVcFB0e3cZ8ok=";
vendor-hash = "sha256-JAAhcMfRTlkQQ8lBMLMN+whkGQ/4WHjywompirnc/GI=";
unwrapped = callPackage ./unwrapped.nix {
inherit

View File

@@ -28,23 +28,27 @@ rustPlatform.buildRustPackage {
OPENSSL_NO_VENDOR = 1;
};
patches = [
# https://github.com/clash-verge-rev/clash-verge-rev/pull/2582
./0001-enable-format_bytes_speed-for-every-platform.patch
];
postPatch = ''
ls $cargoDepsCopy
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \
--replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \
--replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \
--replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \
--replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \
--replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"'
substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \
--replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \
--replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \
--replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \
--replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \
--replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"'
substituteInPlace ./tauri.conf.json \
--replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \
--replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""'
sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json
sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json
substituteInPlace ./tauri.conf.json \
--replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \
--replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""'
sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json
sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json
'';
nativeBuildInputs = [

View File

@@ -7,14 +7,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "exo";
version = "0.0.5-alpha";
version = "0.0.9-alpha";
pyproject = true;
src = fetchFromGitHub {
owner = "exo-explore";
repo = "exo";
tag = "v${version}";
hash = "sha256-bAbKmLoJbDVwGoWTxA3a0CUzVFoso6/Uz6e48MSJDgw=";
hash = "sha256-H3Jxq0GS3Ha9cDsIHCsTupD0/Mp80Mxf2NvAyZytTb0=";
};
build-system = with python3Packages; [ setuptools ];
@@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec {
grpcio
grpcio-tools
jinja2
netifaces
numpy
nuitka
nvidia-ml-py
@@ -42,6 +41,7 @@ python3Packages.buildPythonApplication rec {
pydantic
requests
rich
scapy
tenacity
tqdm
transformers
@@ -74,6 +74,7 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Run your own AI cluster at home with everyday devices";
homepage = "https://github.com/exo-explore/exo";
changelog = "https://github.com/exo-explore/exo/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ GaetanLepage ];
mainProgram = "exo";

View File

@@ -0,0 +1,45 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
buildGoModule rec {
pname = "geteduroam-cli";
version = "0.4";
src = fetchFromGitHub {
owner = "geteduroam";
repo = "linux-app";
tag = version;
hash = "sha256-9+IjrHg536/6ulj94CBhYWY0S3aNA7Ne4JQynMmsLxE=";
};
vendorHash = "sha256-9SNjOC59wcEkxJqBXsgYClHKGH7OFWk3t/wMPLANAy0=";
subPackages = [
"cmd/geteduroam-cli"
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli";
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "CLI client to configure eduroam";
mainProgram = "geteduroam-cli";
homepage = "https://github.com/geteduroam/linux-app";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ viperML ];
platforms = lib.platforms.linux;
changelog = "https://github.com/geteduroam/linux-app/releases/tag/${version}";
};
}

View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "ghostunnel";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "ghostunnel";
repo = "ghostunnel";
rev = "v${version}";
hash = "sha256-WO7dyz+S8dBSFfNCTHHg1lGDlUGSBqa5pcR5GCiWsl8=";
hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
};
vendorHash = null;

View File

@@ -9,16 +9,16 @@
buildGo123Module rec {
pname = "glab";
version = "1.51.0";
version = "1.52.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
hash = "sha256-EWcoEm6DbRT0PP2qYhdwDHCkbeAG6vDVATPhX9pPfiw=";
hash = "sha256-XK/6b2KWwyHev3zVyNKJlOHTenloO28dXgG1ZazE54Q=";
};
vendorHash = "sha256-f6qAFeB9kshtQ2AW6OnEGSnhJYlJ2gAGRDplVmQSVNA=";
vendorHash = "sha256-0Mx7QbQQbRhtBcsRWdnSJvEXAtUus/n/KzXTi33ekvc=";
ldflags = [
"-s"

View File

@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
guile,
pkg-config,
texinfo,
}:
stdenv.mkDerivation rec {
pname = "guile-hoot";
version = "0.5.0";
src = fetchFromGitLab {
owner = "spritely";
repo = "guile-hoot";
rev = "v${version}";
hash = "sha256-n8u0xK2qDLGySxiYWH882/tkL8ggu3hivHn3qdDO9eI=";
};
nativeBuildInputs = [
autoreconfHook
guile
pkg-config
texinfo
];
buildInputs = [
guile
];
strictDeps = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
configureFlags = [
"--with-guile-site-dir=$(out)/${guile.siteDir}"
"--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
];
meta = {
description = "Scheme to WebAssembly compiler backend for GNU Guile and a general purpose WASM toolchain";
homepage = "https://gitlab.com/spritely/guile-hoot";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jinser ];
platforms = lib.platforms.unix;
};
}

View File

@@ -12,18 +12,18 @@
rustPlatform.buildRustPackage rec {
pname = "kakoune-lsp";
version = "18.1.1";
version = "18.1.2";
src = fetchFromGitHub {
owner = "kakoune-lsp";
repo = "kakoune-lsp";
rev = "v${version}";
hash = "sha256-7ULohcCpIKOb7CtsF2dIkiRt94uBIrGD5pQ2AEfrNrY=";
hash = "sha256-wIKAChmD6gVfrRguywiAnpT3kbCbRk2k2u4ckd1CNOw=";
};
patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
cargoHash = "sha256-eG9VPsZkdNTieUc4ghngLqE2ps6wJFR7W8qcmfMu0fs=";
cargoHash = "sha256-6qXdZ1EtYdne0zs5usLXkZm2qYl1gwpTki0cvip+FkE=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices

View File

@@ -13,15 +13,16 @@
installShellFiles,
versionCheckHook,
nix-update-script,
bzip2,
}:
let
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "russellbanks";
repo = "Komac";
tag = "v${version}";
hash = "sha256-yAf89GtKu500VPn+CKF6sGC+TPhJcGz2lR7C30/YBRI=";
hash = "sha256-5mGjzWuArEIl5+SHUaOFIRBEjdeCKQOAsUVepPBbsFM=";
};
in
rustPlatform.buildRustPackage {
@@ -29,7 +30,7 @@ rustPlatform.buildRustPackage {
pname = "komac";
cargoHash = "sha256-wgOZoKsbYkbbCKS+2pfqgsHD5Azw72gPJXHhfw5mNqo=";
cargoHash = "sha256-IM+swMrLoHeY/sk9w6CB66IGCNNioVJzNyKKtXimN5g=";
nativeBuildInputs =
[
@@ -44,6 +45,7 @@ rustPlatform.buildRustPackage {
dbus
openssl
zstd
bzip2
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security

View File

@@ -1,23 +1,23 @@
[
{
"pname": "Geralt",
"version": "2.1.0",
"hash": "sha256-BCXJKa9200GFqlm0GFAyAxGRzlorFxHct83VXyZZlvQ="
"version": "3.3.0",
"hash": "sha256-vTGhyPsE5xxfM4nbADq54wM9FpEXLJgxuT5a2WvY79g="
},
{
"pname": "libsodium",
"version": "1.0.18.4",
"hash": "sha256-mdV0etNrKc5rjsIxhCkj7qafT+yv6PTuYCheveVjPwI="
"version": "1.0.20.1",
"hash": "sha256-wd/z31FRbcaVGrogSNVjefEYWjNxTGzQd04DOlY1PFE="
},
{
"pname": "McMaster.Extensions.CommandLineUtils",
"version": "4.0.2",
"hash": "sha256-e+UEOOxYPOEcX6QXTU8F+G5093qPSrfOqsYCLDcwSvQ="
"version": "4.1.1",
"hash": "sha256-K10ukfRqcRIKJT7PFxc7NFpKWRT+FIDg8IJAR8HA5Eo="
},
{
"pname": "Monocypher",
"version": "0.3.0",
"hash": "sha256-InbhO6d2wZ96Zl69b+KIUVM6XRU1X1op6e15afx6hps="
"version": "0.4.1",
"hash": "sha256-mfLdmQkgsmpCdQuxbdU0IE900FfPrWTdi1iN/ZBL0ow="
},
{
"pname": "System.ComponentModel.Annotations",

View File

@@ -8,23 +8,21 @@
buildDotnetModule rec {
pname = "kryptor";
version = "4.1.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "samuel-lucas6";
repo = "Kryptor";
tag = "v${version}";
hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8=";
hash = "sha256-+pG3u4U3IZ6jw2p2f1jptX7C/qt0mPIcMG82XYtPzbs=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;
projectFile = "src/Kryptor.sln";
projectFile = "src/Kryptor/Kryptor.csproj";
nugetDeps = ./deps.json;
executables = [ "kryptor" ];
dotnetFlags = [ "-p:TargetFramework=net8.0" ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];

View File

@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "miniflux";
version = "2.2.4";
version = "2.2.5";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
tag = version;
hash = "sha256-h5bOZPaYu5DlN4trwf+iMafzfcyXemNdssTYpM6NCZY=";
hash = "sha256-jyGkuLGdf+nZnjSXHdq/tUX1SmnJ/6RNzDMeqA7BoHs=";
};
vendorHash = "sha256-UR1nxza+rZtiSpY5hwAdCU4yiLm8weOCkrZHTqXQEpQ=";
vendorHash = "sha256-clqYjf7aObHaUmjX81czF+DJd5Ka0ZXHvw37f0mzA1I=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.101.0";
version = "2025.118.2";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-JPRjnpBt9CW4/8ykPbVCM6kv8CXEacqJTt6CPByd1P4=";
hash = "sha256-cUyndZAKc2Dd3YHb+rdq5QRE7ei9MxrLaal7yvjVsKE=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-ryDKe8A8pCycPpupWv+zEtGWFs96sBahLF00hCzUViM=";
hash = "sha256-tTuiFEUv5ZVXxiN4ZN26p4ysJWeU2ccQsN06/zR2780=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-GsnTxVpNk2RXHLET6Ugv0/ZOlq8RUkw2ZXqRjkU+dzw=";
hash = "sha256-E2WWjLFEAqDqFso8eO+coZ2cuQEhUS0nBZY45jInEFA=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

View File

@@ -26,8 +26,8 @@
},
{
"pname": "Fody",
"version": "6.8.0",
"hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="
"version": "6.9.1",
"hash": "sha256-yDzLI06oFVNI4wiexSQK114YZlSOoGPTr8LIlr22M8I="
},
{
"pname": "HidSharpCore",
@@ -36,8 +36,8 @@
},
{
"pname": "HtmlAgilityPack",
"version": "1.11.70",
"hash": "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY="
"version": "1.11.72",
"hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k="
},
{
"pname": "Humanizer",
@@ -311,58 +311,73 @@
},
{
"pname": "MessagePack",
"version": "2.5.187",
"hash": "sha256-3sBINhdkGdKPKTKxE4YuLGFHg6stAEHUIboR1g7eXgA="
"version": "3.1.1",
"hash": "sha256-8ClMtDZrSJHc51HNUn/vqGAZlVHIs63BcMnjLczLU6k="
},
{
"pname": "MessagePack.Annotations",
"version": "2.5.187",
"hash": "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw="
"version": "3.1.1",
"hash": "sha256-WGuowO8AJ4nGfSBYtu+qJgP6QqS5mJMHtP/rRHl2Q6w="
},
{
"pname": "MessagePackAnalyzer",
"version": "3.1.1",
"hash": "sha256-V3YSKLjq4mEp8aIGQwPSOvqgCU7xotG0tWOjOqFg7wQ="
},
{
"pname": "Microsoft.AspNetCore.Connections.Abstractions",
"version": "8.0.10",
"hash": "sha256-xnc9qaYB07MAlqCswm6kUX0HMAKcBhxWXClPN2bB8ZA="
"version": "9.0.0",
"hash": "sha256-4o05T9dNf3mBRo2QC+wa2N2n+78bOi3ShzaiauOWXZU="
},
{
"pname": "Microsoft.AspNetCore.Http.Connections.Client",
"version": "8.0.10",
"hash": "sha256-yp0hgu8kyTE2zU156TWmRUpW24SAaKJm7he4MnEuiG8="
"version": "9.0.0",
"hash": "sha256-eK92e37pNx+GIAUYsW4XS42JVrTj3LyKSURxburvOCE="
},
{
"pname": "Microsoft.AspNetCore.Http.Connections.Common",
"version": "8.0.10",
"hash": "sha256-ulLp+Rni007Wq9n5w2BA8DX7uG1HhYNF/KV5TN3SKSs="
"version": "9.0.0",
"hash": "sha256-IkEyefTMiD4LLwzGSCroueZVHfR06Am3QSE/ufWRq2M="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Client",
"version": "8.0.10",
"hash": "sha256-GEiMdjLvuc0Xmxj9/zKo3b4Y0Vh5jAjfZqPs6vwj5o0="
"version": "9.0.0",
"hash": "sha256-yXqMffVsnSBf/VDzHln1QNXOsYLoeAC5QlmjpqlTgxc="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Client.Core",
"version": "8.0.10",
"hash": "sha256-vTk+Smuu0Pi/MmmHZtIjdyBsZuC0gWsL/63ovmtMRWQ="
"version": "9.0.0",
"hash": "sha256-tgXFINCIRruKZAB0wfCLTeKHcAEhSalQmkHX/Zfs1iw="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Common",
"version": "8.0.10",
"hash": "sha256-LlOfWupgG9pXpNXOfHo3/tmS9ZZy3hziAEqI1X42sh4="
"version": "9.0.0",
"hash": "sha256-en6periuk86BXYnnJVy5zfeIqlAKjFVliR6DO5J2UiA="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
"version": "8.0.10",
"hash": "sha256-ZWDnjvZLr0FK91cyeJxtAJk2Cf+YW+6SZTW+zEIozGc="
"version": "9.0.0",
"hash": "sha256-7x5ZJ7NP0+fnVtKPX7EFBgKqVifIw4qqAZWJTzzM2fE="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.MessagePack",
"version": "8.0.10",
"hash": "sha256-xgxjqns/uNbzisoPX1cAmqMMrRCHxcon+l8I5TLUKGo="
"version": "9.0.0",
"hash": "sha256-2z9pE9ZYqTV2Y8dITi1famb37/sn//QytznGR1Mp9zk="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson",
"version": "8.0.10",
"hash": "sha256-HgRvpIaMuEUMJGGuUCxxEigHv/Tlb2/Pd+OQJBHE5DU="
"version": "9.0.0",
"hash": "sha256-4O9K6+55QL5vV5ywvUFPSefpozcY/xeVjeCFiH3kvIE="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "9.0.0",
"hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U="
},
{
"pname": "Microsoft.Bcl.TimeProvider",
"version": "9.0.0",
"hash": "sha256-m3IMExnLJeARejxaFiJyTxLHDoaVv/B75/EEFSPlWWo="
},
{
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -376,8 +391,8 @@
},
{
"pname": "Microsoft.Data.Sqlite.Core",
"version": "8.0.10",
"hash": "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE="
"version": "9.0.0",
"hash": "sha256-zxVvQSpfECqsjawJVIUBuE82pG5mN2F7iPCRLoK7Q4c="
},
{
"pname": "Microsoft.Diagnostics.NETCore.Client",
@@ -396,8 +411,8 @@
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "8.0.0",
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
"version": "9.0.0",
"hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -406,8 +421,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "8.0.1",
"hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
"version": "9.0.0",
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -426,8 +441,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.2",
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
"version": "9.0.0",
"hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
@@ -436,13 +451,13 @@
},
{
"pname": "Microsoft.Extensions.Features",
"version": "8.0.10",
"hash": "sha256-mJXz6jSbr1xG8L3cILyODzX21uh5o4Qy9yWYgZ6okxM="
"version": "9.0.0",
"hash": "sha256-dggXnp8B+17+54anZ3iqZA/amBODUZQe2E9MYgtdV28="
},
{
"pname": "Microsoft.Extensions.Logging",
"version": "8.0.1",
"hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
"version": "9.0.0",
"hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -451,8 +466,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.2",
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
"version": "9.0.0",
"hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
},
{
"pname": "Microsoft.Extensions.ObjectPool",
@@ -466,8 +481,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
"version": "8.0.2",
"hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
"version": "9.0.0",
"hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
},
{
"pname": "Microsoft.Extensions.Primitives",
@@ -476,13 +491,13 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "8.0.0",
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
"version": "9.0.0",
"hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
},
{
"pname": "Microsoft.NET.StringTools",
"version": "17.6.3",
"hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
"version": "17.11.4",
"hash": "sha256-lWfzY35WQ+iKS9TpuztDTljgF9CIORhFhFEm0p1dVBE="
},
{
"pname": "Microsoft.NETCore.Platforms",
@@ -536,8 +551,8 @@
},
{
"pname": "MongoDB.Bson",
"version": "2.19.1",
"hash": "sha256-HUdPLxxzJNYQm22NEmwJoq0B6LtRK8d4NBstqi0t9uw="
"version": "2.21.0",
"hash": "sha256-LZdDJkwQSVBLJfeE3SEckpi+EZcHIccHlhHoUxZ5FqE="
},
{
"pname": "NativeLibraryLoader",
@@ -576,8 +591,8 @@
},
{
"pname": "NVika",
"version": "3.0.0",
"hash": "sha256-zgg8aUuIFQ4EZHScy+YHmkwDE9K5vzUJF8s9aiJNFuw="
"version": "4.0.0",
"hash": "sha256-daeovN+AsZX0r59SKYDSbofVAsXxT2DOTV892QrgMLY="
},
{
"pname": "OpenTabletDriver",
@@ -636,8 +651,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2024.1224.0",
"hash": "sha256-Ci0tblihnKxv8c0vgYvTDTfu2Fl6huEsl/2/SDdh5CQ="
"version": "2025.117.0",
"hash": "sha256-kEYVwig05l5qmS/4OAATHwYCFMyToVt/EGhwtUfV7sg="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +681,8 @@
},
{
"pname": "ppy.SDL3-CS",
"version": "2024.1128.0",
"hash": "sha256-iiIBD2MeSMMxw7jn0QBrnD6fu457x9d3jKYe0upxoA4="
"version": "2025.104.0",
"hash": "sha256-qsszZxBGVycfukowE0fxNtM1EZFqKyssZJoOzB5K80g="
},
{
"pname": "ppy.Veldrid",
@@ -696,13 +711,8 @@
},
{
"pname": "Realm",
"version": "11.5.0",
"hash": "sha256-ykC2fyOh4XeRJyLoO3jQQC4sZcFhSms7wswSO6Iu8mQ="
},
{
"pname": "Realm.PlatformHelpers",
"version": "11.5.0",
"hash": "sha256-6QUO6jQC3VwxKsNY24WSgLNtOwcaGjQDtP0S4DSt670="
"version": "20.1.0",
"hash": "sha256-DxJwBTYKGw3CcLj7j5dv7GmJTjGo5c8Z+0VwNjY74lA="
},
{
"pname": "Remotion.Linq",
@@ -799,16 +809,31 @@
"version": "4.3.0",
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
},
{
"pname": "runtime.native.System",
"version": "4.0.0",
@@ -844,16 +869,31 @@
"version": "4.3.0",
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
@@ -864,26 +904,51 @@
"version": "4.3.0",
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="
},
{
"pname": "runtime.unix.Microsoft.Win32.Primitives",
"version": "4.3.0",
@@ -926,8 +991,8 @@
},
{
"pname": "Sentry",
"version": "4.13.0",
"hash": "sha256-JeyxQFOic72eQ41Guy4NbPy/A4wXvA812229vpLcLCM="
"version": "5.0.0",
"hash": "sha256-kafv0LOBPgYpX7YHU3RK7XmwVn9wuPfHZufw39aeFec="
},
{
"pname": "SharpCompress",
@@ -964,11 +1029,6 @@
"version": "2.1.10",
"hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
},
{
"pname": "SQLitePCLRaw.core",
"version": "2.1.6",
"hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
},
{
"pname": "SQLitePCLRaw.lib.e_sqlite3",
"version": "2.1.10",
@@ -1049,6 +1109,11 @@
"version": "4.3.0",
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "9.0.0",
"hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
@@ -1126,13 +1191,13 @@
},
{
"pname": "System.IO.Packaging",
"version": "8.0.1",
"hash": "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4="
"version": "9.0.0",
"hash": "sha256-uIMItgRrAKHBUes9A17SqNFwTd7gjFjUsfD92v4rie4="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
"version": "9.0.0",
"hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
},
{
"pname": "System.Linq",
@@ -1191,8 +1256,13 @@
},
{
"pname": "System.Net.Security",
"version": "4.3.0",
"hash": "sha256-B7laE1z1+ldbo6JkjlDjZynG5JiMZ/3uNHPHMP6LRak="
"version": "4.3.2",
"hash": "sha256-CAuJ0uLmDKRqbG42rBhHjHcKelYTE5gpjRlrvYNigas="
},
{
"pname": "System.Net.ServerSentEvents",
"version": "9.0.0",
"hash": "sha256-WOMFdUD4R7a+4OU6R0+Ch/yQ9LoepxBrMBBiq2Pnb7s="
},
{
"pname": "System.Net.Sockets",
@@ -1464,6 +1534,16 @@
"version": "4.3.0",
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.0",
"hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="
},
{
"pname": "System.Text.Json",
"version": "9.0.0",
"hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
@@ -1486,8 +1566,8 @@
},
{
"pname": "System.Threading.Channels",
"version": "8.0.0",
"hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
"version": "9.0.0",
"hash": "sha256-depIorJqzjyWew0+aBRgbGh88KWivbp9RrtWZHFr+pI="
},
{
"pname": "System.Threading.Tasks",
@@ -1531,8 +1611,8 @@
},
{
"pname": "Velopack",
"version": "0.0.915",
"hash": "sha256-L31qPk7/MLexF+5FP4gdNfwAWB6kNlvMFL2nfkQBSQU="
"version": "0.0.1053",
"hash": "sha256-YAOvvHDyazxqxQoZ7rDB3szkYnTq/zrzS9mXnpI+2jI="
},
{
"pname": "Vortice.D3DCompiler",

View File

@@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.101.0";
version = "2025.118.2";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-8sckmwFFL7Vcf947EVxqIRPU/yYrEFVwz+zqwZZ34Mw=";
hash = "sha256-pQEMd+y+uS+Xl8lBuk7KwX7AcPs0MCXwkY5oPBPWmEE=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

View File

@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
buildNpmPackage,
nodejs_20,
nixosTests,
@@ -26,15 +25,14 @@
nltk-data,
xorg,
}:
let
version = "2.13.5";
version = "2.14.4";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-AVfm5tC2+hTdEv0ildEj0El1M/sF7ftkEn3pUkG1O7Q=";
tag = "v${version}";
hash = "sha256-asjTRjEMnJcmyAZNZQ+VxXeyGc+j0j1JAAOrOaQ7ma4=";
};
# subpath installation is broken with uvicorn >= 0.26
@@ -88,7 +86,7 @@ let
cd src-ui
'';
npmDepsHash = "sha256-pBCWcdCTQh0N4pRLBWLZXybuhpiat030xvPZ5z7CUJ0=";
npmDepsHash = "sha256-JUmYSHHrNWpJNp01Er2zMgiVVIIOAC+QlKw1HAjD7/E=";
nativeBuildInputs =
[
@@ -138,14 +136,6 @@ python.pkgs.buildPythonApplication rec {
inherit version src;
patches = [
(fetchpatch2 {
name = "ocrmypdf-16.6-compat.patch";
url = "https://github.com/paperless-ngx/paperless-ngx/commit/d1f255a22ea53712cb9101277ec57ea1976f9c02.patch?full_index=1";
hash = "sha256-V2nnNeNCcfSrjOttQ5rgDj7gnxpfpBPVeDDnMea0C3U=";
})
];
postPatch = ''
# pytest-xdist with to many threads makes the tests flaky
if (( $NIX_BUILD_CORES > 4)); then
@@ -215,6 +205,7 @@ python.pkgs.buildPythonApplication rec {
whoosh
zxing-cpp
]
++ django-allauth.optional-dependencies.mfa
++ django-allauth.optional-dependencies.socialaccount
++ redis.optional-dependencies.hiredis
++ uvicorn.optional-dependencies.standard;

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "parca-debuginfo";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "parca-dev";
repo = "parca-debuginfo";
tag = "v${version}";
hash = "sha256-gL1BgDtEf2Q7yxzpoiTJY+nsRlsWv3zYzLVvaVijMDM=";
hash = "sha256-FXi/iLVDdzyfClRD1tk0FQ9oF5zxW2dfGl4JuDPyZQE=";
};
vendorHash = "sha256-xtKkKhKQmZcCIFTOH+oM5a2cPlAWlJPRNQWfrAl2948=";
vendorHash = "sha256-bH7Y1y9BDMQJGtYfEaSrq+sWVLnovvV/uGbutJUXV2w=";
ldflags = [
"-X=main.version=${version}"

View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "protoc-gen-connect-go";
version = "1.18.0";
version = "1.18.1";
src = fetchFromGitHub {
owner = "connectrpc";
repo = "connect-go";
tag = "v${version}";
hash = "sha256-/RfGduRfXEZO66qhKOOMpESNxBghjqf/vbg1gkCPyHM=";
hash = "sha256-w3zn2O5gc3cbLsHStF53t1kitXvCxCyNcR5mfcr92Sg=";
};
vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo=";

View File

@@ -1,9 +1,24 @@
[
{
"pname": "Avalonia",
"version": "11.0.0",
"hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
},
{
"pname": "Avalonia",
"version": "11.0.10",
"hash": "sha256-FuGl5admJ9AeRNrg/faGfqx8pwxGxdkmbnth9Jxhelc="
},
{
"pname": "Avalonia",
"version": "11.0.13",
"hash": "sha256-D0KHUUC3FxhOxeVowzVHRtRYfoV1G8Xk55LMF4Rw8w4="
},
{
"pname": "Avalonia",
"version": "11.0.4",
"hash": "sha256-YEqAwBRAhvhN5eT8GqOA8XsSwEF4ccwTMBWxBlIHLUo="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
"version": "2.1.0.2023020321",
@@ -16,8 +31,8 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.0.10",
"hash": "sha256-G0ooIjNRW5YHKvQ6qPxe5gaE3HPwGfiCQUo34PSxXGg="
"version": "11.0.13",
"hash": "sha256-FMZb1CAWdI/+aDeLFJfgQbbxTK2BYYY+qc4A3s1wIIk="
},
{
"pname": "Avalonia.Controls.ColorPicker",
@@ -26,8 +41,13 @@
},
{
"pname": "Avalonia.Controls.DataGrid",
"version": "11.0.10",
"hash": "sha256-0v4evkV0jbLffwfQG/QO/RQbHXlCBmFv8A2pBZjS5Y0="
"version": "11.0.13",
"hash": "sha256-Mi6Z55KbQuU7RSiWkMjFzktZxuyuQyXnDw5B1ZS0bHc="
},
{
"pname": "Avalonia.Controls.DataGrid",
"version": "11.0.4",
"hash": "sha256-wlig5frBAO1DPH9GX0h8MZQq3U4F4K16EliC6N0NbII="
},
{
"pname": "Avalonia.Controls.ItemsRepeater",
@@ -36,38 +56,33 @@
},
{
"pname": "Avalonia.Desktop",
"version": "11.0.10",
"hash": "sha256-fIty7TfiTC+OX9gCH4tA8Fs9dF4+G7Mhs9XnZadUR2g="
"version": "11.0.13",
"hash": "sha256-s3wC2g4wvrH7N2nsYSJL+TeF1u8K+EvKuqwP4IeKFaY="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.0.10",
"hash": "sha256-itnN+LIZ2S+1CjD0ZS/woKtpgWbC/srMYzbYfX3a8LA="
"version": "11.0.13",
"hash": "sha256-JkUNex22YFPIezXZ8NxESXuWcVaQWnrqc7AqMW4vdoE="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.0.10",
"hash": "sha256-uVNOOVTQIqQ2pDgSsz5saI7+fMvps40vJlMp1/XdyaE="
"version": "11.0.13",
"hash": "sha256-MqUKd2AXfgneqVZGtSukWHx0qkaXAKKEclagB0h4gHY="
},
{
"pname": "Avalonia.Markup.Xaml.Loader",
"version": "11.0.10",
"hash": "sha256-Xv6L8U34QEiH6r3SQWLwuVFk9N9REmCUHa9hEbv2m24="
"version": "11.0.13",
"hash": "sha256-PCPFXGY7GmryYjo2CfIiR56ZiXVblf6LOp2ffBjm+Ug="
},
{
"pname": "Avalonia.Native",
"version": "11.0.10",
"hash": "sha256-P9j01FDXDpixo8wBVH3XK0Am6UBhG52HDrzt1ZqD8Ro="
"version": "11.0.13",
"hash": "sha256-RSVkyeOb79CjvmWwhRErOl5iH/nOikq0gYpcTGWyS+8="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.0.10",
"hash": "sha256-qtvlczTg2yUZWyyqXkkboB8lK9aYv+STbfDvSKb55Vw="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.0.4",
"hash": "sha256-13qXDjlWElmwQ0sb00+ny9gOgKuDOHKvALuQB6EZxCQ="
"version": "11.0.13",
"hash": "sha256-mCIK3OjPRzaZYdSGjkO/EBKUa79nJo2HUBzlux5dqEc="
},
{
"pname": "Avalonia.Skia",
@@ -76,8 +91,8 @@
},
{
"pname": "Avalonia.Skia",
"version": "11.0.10",
"hash": "sha256-1SU17j43Fiw4LbEEgqx10zE/iIVPfb8G1JVbfD2RhXA="
"version": "11.0.13",
"hash": "sha256-ar7m2gWTgkrHFKjBhdtbo6rFrrQdS2HUVB/9w7KgDkI="
},
{
"pname": "Avalonia.Skia",
@@ -86,38 +101,48 @@
},
{
"pname": "Avalonia.Svg",
"version": "11.0.0.18",
"hash": "sha256-U4bafxxxFE0tKmKVxguxH+doFrTHlM6DjFP8wz6Xm9U="
"version": "11.0.0.19",
"hash": "sha256-1zLVEXhzv+LHBXPcSUt7DCvRXMRQALm2Hj781jPGdc0="
},
{
"pname": "Avalonia.Svg.Skia",
"version": "11.0.0.18",
"hash": "sha256-M4AQkL42efqOSck4Lf7C1naIRjEPMlnxi3OVC8zLJaQ="
"version": "11.0.0.19",
"hash": "sha256-5e6xtJnn14ZDkiHsulG4Y3yH/aXPy1yNZMQXcb38EM0="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.0.10",
"hash": "sha256-54fc2g1yvM7pPRaF062lSjXaQDe2i61xQRM8m81vWm8="
"version": "11.0.13",
"hash": "sha256-rTCC/nvzyl1PDm1MtIFne6uplHvjacQW+Sva68A9aOs="
},
{
"pname": "Avalonia.Win32",
"version": "11.0.10",
"hash": "sha256-+o228ElrBJBxBkZKGbo3x8/52wKpnAk/x6Yon5pyA74="
"version": "11.0.13",
"hash": "sha256-QMTh5cx1AxS93HoaRAOSAj/B4hwLFjHlR6NzoXNLaMU="
},
{
"pname": "Avalonia.X11",
"version": "11.0.10",
"hash": "sha256-/CRivMxpcbW1FnIuwZbF2ucdcbn4TCyjKzLXgdGtCfQ="
"version": "11.0.13",
"hash": "sha256-OaqFH+F0VIFoCstISNuS4d5p97QCCQ+OZs6QJx0UH+o="
},
{
"pname": "CommandLineParser",
"version": "2.9.1",
"hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.4.0",
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
},
{
"pname": "Concentus",
"version": "2.2.0",
"hash": "sha256-7wbB76WoTd2CISIODGhmEiPIrydI0dqDMZGf4gdkogM="
"version": "2.2.2",
"hash": "sha256-9If4kL72V1evHOz0IONX8ASIy/rAtAm6RhzLzu+BSB8="
},
{
"pname": "csFastFloat",
"version": "4.1.5",
"hash": "sha256-dEbMPu/EmsRodI20P15F38QInil0IPcKE03akYp8tBY="
},
{
"pname": "DiscordRichPresence",
@@ -146,13 +171,8 @@
},
{
"pname": "Gommon",
"version": "2.6.8",
"hash": "sha256-teKaZOJVjH2bJFQoD+hkCo/w62j6A7FM0ESkpT10rdI="
},
{
"pname": "HarfBuzzSharp",
"version": "2.8.2.3",
"hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="
"version": "2.7.0.2",
"hash": "sha256-gFDtIC6VJ8aaxolppXPG8pBTe9ApBCDy2DFm8Qrxa5w="
},
{
"pname": "HarfBuzzSharp",
@@ -160,29 +180,24 @@
"hash": "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "2.8.2.3",
"hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="
"pname": "HarfBuzzSharp",
"version": "7.3.0.2",
"hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "7.3.0",
"hash": "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "2.8.2.3",
"hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0",
"hash": "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "2.8.2.3",
"hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0.2",
"hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
@@ -191,13 +206,13 @@
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "2.8.2.3",
"hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="
"version": "7.3.0",
"hash": "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "7.3.0",
"hash": "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="
"version": "7.3.0.2",
"hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
},
{
"pname": "Humanizer",
@@ -469,11 +484,6 @@
"version": "0.11.0",
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
},
{
"pname": "Microsoft.Bcl.TimeProvider",
"version": "8.0.1",
"hash": "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.0.0",
@@ -541,23 +551,23 @@
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.1.2",
"hash": "sha256-uS0TjGTpt6q38Xheiu93yK3u47qK/dveidZabyKu7m0="
"version": "8.3.0",
"hash": "sha256-LSZ91DbPswCWibHNSGWC3Jh3KQwAthVaU3r7XQJyutM="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "8.1.2",
"hash": "sha256-ASv9e7Q2Z5bfWfzCpQe5nQh782WISceFlxGwgJ51RHI="
"version": "8.3.0",
"hash": "sha256-Hiiv10LSOMIt7KsQSsteJV4DFkLebHMYmoISn/pl2F8="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "8.1.2",
"hash": "sha256-Yv1B2ETQTPm95LoNg2op4V5arrb0udDq/ZdfiZl/Sc0="
"version": "8.3.0",
"hash": "sha256-0P14ilpV+9yp+nqZWI/ilkTnRas4pic8NjNVcYxuXWs="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "8.1.2",
"hash": "sha256-8fmgNOX1nyiNKrszZl3fvkxzCPuaeUbQJV45by8qRZs="
"version": "8.3.0",
"hash": "sha256-+TzBeZH2Tgs0EMoU5QuCdOD/5V8xM7MHClX578AUIxw="
},
{
"pname": "Microsoft.IO.RecyclableMemoryStream",
@@ -689,11 +699,6 @@
"version": "9.4.0",
"hash": "sha256-OTXZAbTsIWjJ7CduyuW57RoExC0eHYIwk9yq3TEGEXE="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
@@ -709,11 +714,6 @@
"version": "4.3.0",
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
},
{
"pname": "runtime.any.System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
@@ -729,16 +729,6 @@
"version": "4.3.0",
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
@@ -809,11 +799,6 @@
"version": "4.3.0",
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
@@ -854,11 +839,21 @@
"version": "0.1.0",
"hash": "sha256-Am+ZednCVJUDgB7TePyY3CTxKDQ6Lr8M8KiCVAJoouw="
},
{
"pname": "Sep",
"version": "0.6.0",
"hash": "sha256-O7v1QBhdzoKTq0cGWEvXOk3H6l85TliETqCLeKnhZwE="
},
{
"pname": "shaderc.net",
"version": "0.1.0",
"hash": "sha256-+K7ObC9ucilwWY+Tlf9KcrAVoTFS65V6Di7JDWDSZTg="
},
{
"pname": "SharpMetal",
"version": "1.0.0-preview21",
"hash": "sha256-ixS88SuK94KfBONdTgXSPSI4tftqekjQ3aJ502rG3Vo="
},
{
"pname": "SharpZipLib",
"version": "1.4.2",
@@ -866,38 +861,28 @@
},
{
"pname": "ShimSkiaSharp",
"version": "1.0.0.18",
"hash": "sha256-72NV+OuW8bCfI/EOXwgS6dleLZnomLJTYeQPPmfhuu8="
"version": "1.0.0.19",
"hash": "sha256-hSE5GzYLGexJcTynPJX2Szru2ioRfEKoHXx3hKyyQak="
},
{
"pname": "Silk.NET.Core",
"version": "2.21.0",
"hash": "sha256-D4ZUCm1Gf/EiRWrSwSLrdXT6U54icY2E/vrvCD/bRHw="
"version": "2.22.0",
"hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc="
},
{
"pname": "Silk.NET.Vulkan",
"version": "2.21.0",
"hash": "sha256-Xnxl13+ziJ1+jNxMFSrEuh6NvL1FBrYmJ/d3HQXpgzY="
"version": "2.22.0",
"hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY="
},
{
"pname": "Silk.NET.Vulkan.Extensions.EXT",
"version": "2.21.0",
"hash": "sha256-udELG0ppCOP9eT2yl/sI9MgKOVOuK0py9znmoaBGDpk="
"version": "2.22.0",
"hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk="
},
{
"pname": "Silk.NET.Vulkan.Extensions.KHR",
"version": "2.21.0",
"hash": "sha256-KyiGHW6CNkXE3EdHk3ufwTVG7oLvSyHwx+MmIJhsiBk="
},
{
"pname": "SkiaSharp",
"version": "2.88.3",
"hash": "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="
},
{
"pname": "SkiaSharp",
"version": "2.88.6",
"hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="
"version": "2.22.0",
"hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U="
},
{
"pname": "SkiaSharp",
@@ -905,14 +890,19 @@
"hash": "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="
},
{
"pname": "SkiaSharp.HarfBuzz",
"version": "2.88.6",
"hash": "sha256-gpHiTuHfiXgbkBkzipXb8EXIatefsod75nyrFdPcwcA="
"pname": "SkiaSharp",
"version": "2.88.8",
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "2.88.3",
"hash": "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="
"pname": "SkiaSharp",
"version": "2.88.9",
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
},
{
"pname": "SkiaSharp.HarfBuzz",
"version": "2.88.8",
"hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
@@ -920,24 +910,19 @@
"hash": "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.3",
"hash": "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "2.88.9",
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.6",
"hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="
"version": "2.88.8",
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.7",
"hash": "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "2.88.3",
"hash": "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="
"version": "2.88.9",
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
@@ -946,18 +931,13 @@
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.3",
"hash": "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="
"version": "2.88.8",
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.6",
"hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.7",
"hash": "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "SPB",
@@ -966,18 +946,18 @@
},
{
"pname": "Svg.Custom",
"version": "1.0.0.18",
"hash": "sha256-RguRPwBM/KCogaiOgjELlvuqN1Tr+b3HA4Odz1rXBgU="
"version": "1.0.0.19",
"hash": "sha256-kjFMp24Jsq9pfCbpBZchMUWoSYHvic5GQYjk7gWxXnM="
},
{
"pname": "Svg.Model",
"version": "1.0.0.18",
"hash": "sha256-CXZC45txfcd8MuRmDENw2ujlGk74YaUPNs7dXq+Zcg8="
"version": "1.0.0.19",
"hash": "sha256-j+5pz1bEvWgRph4E+P79cIfyaOQdkJlMLjj0LKgfd/I="
},
{
"pname": "Svg.Skia",
"version": "1.0.0.18",
"hash": "sha256-o5VnCaAGX4LuwNyl7QM0KOg2gNfkD5uNMNthxB7w0m4="
"version": "1.0.0.19",
"hash": "sha256-0ieJcR766S4cEIgiHfj3fnWRS1m4Ez1bh47x0R4xIL8="
},
{
"pname": "System.Buffers",
@@ -991,8 +971,8 @@
},
{
"pname": "System.CodeDom",
"version": "8.0.0",
"hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
"version": "9.0.0",
"hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw="
},
{
"pname": "System.Collections",
@@ -1036,8 +1016,8 @@
},
{
"pname": "System.IO.Hashing",
"version": "8.0.0",
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
"version": "9.0.0",
"hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="
},
{
"pname": "System.IO.Pipelines",
@@ -1056,8 +1036,8 @@
},
{
"pname": "System.Management",
"version": "8.0.0",
"hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
"version": "9.0.0",
"hash": "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ="
},
{
"pname": "System.Memory",
@@ -1159,6 +1139,16 @@
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.2",
"hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.7.1",
@@ -1179,11 +1169,6 @@
"version": "4.3.0",
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",

View File

@@ -29,14 +29,14 @@
}:
buildDotnetModule rec {
pname = "ryujinx-greemdev";
version = "1.2.78";
pname = "ryubing";
version = "1.2.80";
src = fetchFromGitHub {
owner = "GreemDev";
owner = "Ryubing";
repo = "Ryujinx";
rev = version;
hash = "sha256-kAF5Klve4132wSlFdkRqlpISpozRpZfCizEX1KvHc4I=";
hash = "sha256-BIiqXXtkc55FQL0HAXxtyx3rA42DTcTxG2pdNmEa5jE=";
};
nativeBuildInputs = lib.optional stdenv.isDarwin [
@@ -46,8 +46,8 @@ buildDotnetModule rec {
enableParallelBuilding = false;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.runtime_9_0;
nugetDeps = ./deps.json;
@@ -92,7 +92,6 @@ buildDotnetModule rec {
];
executables = [
"Ryujinx.Headless.SDL2"
"Ryujinx"
];
@@ -128,9 +127,9 @@ buildDotnetModule rec {
passthru.updateScript = ./updater.sh;
meta = with lib; {
homepage = "https://github.com/GreemDev/Ryujinx";
changelog = "https://github.com/GreemDev/Ryujinx/wiki/Changelog";
description = "Experimental Nintendo Switch Emulator written in C# (QoL fork)";
homepage = "https://github.com/Ryubing/Ryujinx";
changelog = "https://github.com/Ryubing/Ryujinx/wiki/Changelog";
description = "Experimental Nintendo Switch Emulator written in C# (community fork of Ryujinx)";
longDescription = ''
Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
written in C#. This emulator aims at providing excellent accuracy and

View File

@@ -25,7 +25,7 @@ if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then
RELEASE_DATA=$(
curl -s -H "Accept: application/vnd.github.v3+json" \
${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
https://api.github.com/repos/GreemDev/Ryujinx/releases
https://api.github.com/repos/Ryubing/Ryujinx/releases
)
if [ -z "$RELEASE_DATA" ] || [[ $RELEASE_DATA =~ "rate limit exceeded" ]]; then
echo "failed to get release job data" >&2
@@ -47,11 +47,11 @@ fi
cd ../../../..
if [[ "${1-default}" != "--deps-only" ]]; then
SHA="$(nix-prefetch-git https://github.com/GreemDev/Ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')"
SHA="$(nix-prefetch-git https://github.com/Ryubing/Ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')"
SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA")
update-source-version ryujinx-greemdev "$NEW_VERSION" "$SRI"
update-source-version ryubing "$NEW_VERSION" "$SRI"
fi
echo "building Nuget lockfile"
eval "$(nix-build -A ryujinx-greemdev.fetch-deps --no-out-link)"
eval "$(nix-build -A ryubing.fetch-deps --no-out-link)"

View File

@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "slackdump";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "rusq";
repo = "slackdump";
tag = "v${version}";
hash = "sha256-XkNxkLKm22an8Ts1kLdOyqNyV7mG5ZQJXOsAoFh3CjY=";
hash = "sha256-fHWKKzUsvL3ine4ub4qnrp8fmc+PNwG32phCz68FC6s=";
};
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -32,7 +32,7 @@ buildGoModule rec {
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
];
vendorHash = "sha256-4fgII2IJ0UCbUtqutMak9T2qhpZg1hu9Y+bxSaxcgqc=";
vendorHash = "sha256-c3Z4p/u7+fMV9kydh7fqRxSEERJI3cw1XoIPcMp0mL4=";
__darwinAllowLocalNetworking = true;

View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
tag = "v${version}";
hash = "sha256-Qvt9/okT37J3ge/lb17OX4aaiXbSFU1j7drdiJDqFnA=";
hash = "sha256-Cff++tGfKcpTaiBVTRZnNzExAHlq4UfkeiIDe3gOF3w=";
};
vendorHash = "sha256-vZFXqU9tgnL8odBpOcvRig1KKVH20CM0ze0+pypaRKE=";
vendorHash = "sha256-L0lmTKj1gUFT1bVoCxMXnEpv2LUo/bl1eeOJmeeixhw=";
ldflags = [
"-s"

View File

@@ -15,16 +15,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.12.5";
version = "1.12.6";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-w2JcNynsbkk29Lx3XiEGSRzSfrA1NbD0NiTDAYvpl+o=";
hash = "sha256-+LrdQ3IWBOFc5qN0o9QYAiZ4VK+KhTD3MVtIhUBg+sQ=";
};
npmDepsHash = "sha256-9GXF3huM4vsQqWmCgkGTx/g3F3oWzDxAZUZNwPWPk1s=";
npmDepsHash = "sha256-5ULVVMmCnujrJmeZPDUIkuce4Gy6lMo+IwjAud/5cmE=";
nativeBuildInputs = [
makeWrapper

File diff suppressed because it is too large Load Diff

View File

@@ -1,127 +1,70 @@
{
lib,
cargo-tauri_1,
cmake,
cargo-tauri,
dbus,
fetchgit,
fetchYarnDeps,
freetype,
gsettings-desktop-schemas,
gtk3,
libsoup_2_4,
stdenv,
yarnConfigHook,
yarnBuildHook,
nodejs,
openssl,
pkg-config,
rustPlatform,
webkitgtk_4_0,
wrapGAppsHook3,
webkitgtk_4_1,
libayatana-appindicator,
wrapGAppsHook4,
sqlite,
}:
let
rustPlatform.buildRustPackage rec {
pname = "treedome";
version = "0.5.1";
version = "0.5.4";
src = fetchgit {
url = "https://codeberg.org/solver-orgz/treedome";
rev = version;
hash = "sha256-EYSB9BJhk0yIwT1h8cIo6fpDI10av6yCtOR4FuAY5dM=";
hash = "sha256-fJnrM9I11JKqzrprXa51mJiz9oO5hDp6u69FqJs5l8o=";
fetchLFS = true;
};
frontend-build = stdenv.mkDerivation (finalAttrs: {
pname = "treedome-ui";
inherit version src;
useFetchCargoVendor = true;
cargoHash = "sha256-scCF4xpc1COdlg57/eNTPdgY7/cJkdcc2s1YNraXzXk=";
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-H9Y/heYEPU5LvIZAgVn0FhiNQ0QKAQEDQ1/oFogi9vc=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
nodejs
];
installPhase = ''
runHook preInstall
mkdir -p $out/dist
cp -r dist/** $out/dist
runHook postInstall
'';
});
in
rustPlatform.buildRustPackage {
inherit version pname src;
sourceRoot = "${src.name}/src-tauri";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"fix-path-env-0.0.0" = "sha256-ewE3CwqLC8dvi94UrQsWbp0mjmrzEJIGPDYtdmQ/sGs=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-in1A1XcfZK5F/EV5CYgfqig+8vKsxd6XhzfSv7Z0nNQ=";
};
env = {
VERGEN_GIT_DESCRIBE = version;
};
preConfigure = ''
mkdir -p dist
cp -R ${frontend-build}/dist/** dist
'';
# copy the frontend static resources to final build directory
# Also modify tauri.conf.json so that it expects the resources at the new location
postPatch = ''
substituteInPlace ./tauri.conf.json \
--replace '"distDir": "../dist",' '"distDir": "dist",' \
--replace '"beforeBuildCommand": "yarn run build",' '"beforeBuildCommand": "",'
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
nativeBuildInputs = [
cmake
cargo-tauri.hook
nodejs
pkg-config
cargo-tauri_1
wrapGAppsHook3
wrapGAppsHook4
yarnConfigHook
];
buildInputs = [
dbus
openssl
freetype
libsoup_2_4
gtk3
webkitgtk_4_0
webkitgtk_4_1
libayatana-appindicator
gsettings-desktop-schemas
sqlite
];
buildPhase = ''
runHook preBuild
cargoRoot = "src-tauri";
buildAndTestSubdir = cargoRoot;
cargo tauri build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin/
mkdir -p $out/share/
cp target/release/bundle/deb/treedome_0.0.0_amd64/data/usr/bin/treedome $out/bin/treedome
cp -R target/release/bundle/deb/treedome_0.0.0_amd64/data/usr/share/** $out/share/
runHook postInstall
'';
env = {
VERGEN_GIT_DESCRIBE = version;
};
# WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
postFixup = ''
@@ -132,7 +75,7 @@ rustPlatform.buildRustPackage {
meta = with lib; {
description = "Local-first, encrypted, note taking application organized in tree-like structures";
homepage = " https://codeberg.org/solver-orgz/treedome";
license = licenses.agpl3Only;
license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" ];
mainProgram = "treedome";
maintainers = with maintainers; [ tengkuizdihar ];

View File

@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "woof-doom";
version = "15.0.1";
version = "15.1.0";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = "woof";
rev = "woof_${finalAttrs.version}";
hash = "sha256-B1pcozy6ZyJkrrxnoL4tXSlb/VzZ9NoSPub8OVVorXo=";
hash = "sha256-rVcD+yeqkguNcfusVI1Y0X+RkXRMIShr9FjTbWB4Qfg=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,154 @@
From a487908c22fe0a37669bbe5a8bdcd945b05b2f33 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 20 Jan 2025 19:06:54 +0100
Subject: [PATCH] treewide: Switch to glog CMake module
---
CMakeLists.txt | 2 +-
src/common/priv/CMakeLists.txt | 2 +-
src/common/public/CMakeLists.txt | 2 +-
src/downloads/daemon/CMakeLists.txt | 2 +-
src/downloads/priv/CMakeLists.txt | 2 +-
src/downloads/qml/CMakeLists.txt | 2 +-
src/downloads/test-daemon/CMakeLists.txt | 2 +-
src/extractor/CMakeLists.txt | 2 +-
src/uploads/daemon/CMakeLists.txt | 2 +-
src/uploads/priv/CMakeLists.txt | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c4750a2..e44d09ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,10 +50,10 @@ set(CMAKE_AUTOMOC ON)
find_package(Qt5 COMPONENTS Core DBus Network Sql Test REQUIRED)
find_package(Boost COMPONENTS log program_options REQUIRED)
+find_package(glog REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(DBUS REQUIRED dbus-1)
-pkg_check_modules(GLOG REQUIRED libglog)
pkg_check_modules(LOMIRI_API REQUIRED liblomiri-api)
if(USE_SYSTEMD)
diff --git a/src/common/priv/CMakeLists.txt b/src/common/priv/CMakeLists.txt
index e7723f3d..105ec5d2 100644
--- a/src/common/priv/CMakeLists.txt
+++ b/src/common/priv/CMakeLists.txt
@@ -75,7 +75,7 @@ set_target_properties(
target_link_libraries(${TARGET}
${LOMIRI_API_LDFLAGS}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::Network
Qt5::Sql
Qt5::Core
diff --git a/src/common/public/CMakeLists.txt b/src/common/public/CMakeLists.txt
index 4b1e8660..eeeeab13 100644
--- a/src/common/public/CMakeLists.txt
+++ b/src/common/public/CMakeLists.txt
@@ -50,7 +50,7 @@ set_target_properties(
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::DBus
Qt5::Network
)
diff --git a/src/downloads/daemon/CMakeLists.txt b/src/downloads/daemon/CMakeLists.txt
index cdc9f83b..24e2334c 100644
--- a/src/downloads/daemon/CMakeLists.txt
+++ b/src/downloads/daemon/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(${TARGET}
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::Core
ldm-common
ldm-priv-common
diff --git a/src/downloads/priv/CMakeLists.txt b/src/downloads/priv/CMakeLists.txt
index 9eaf3092..c453a7a1 100644
--- a/src/downloads/priv/CMakeLists.txt
+++ b/src/downloads/priv/CMakeLists.txt
@@ -65,7 +65,7 @@ set_target_properties(
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::DBus
Qt5::Sql
ldm-common
diff --git a/src/downloads/qml/CMakeLists.txt b/src/downloads/qml/CMakeLists.txt
index 7e2d9285..49d68f1c 100644
--- a/src/downloads/qml/CMakeLists.txt
+++ b/src/downloads/qml/CMakeLists.txt
@@ -34,7 +34,7 @@ find_package(Qt5 COMPONENTS Core Qml Quick REQUIRED)
target_link_libraries(${TARGET} Qt5::Core Qt5::Qml Qt5::Quick)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
ldm-common
lomiri-download-manager-common
lomiri-download-manager-client
diff --git a/src/downloads/test-daemon/CMakeLists.txt b/src/downloads/test-daemon/CMakeLists.txt
index d12207a1..6734e65d 100644
--- a/src/downloads/test-daemon/CMakeLists.txt
+++ b/src/downloads/test-daemon/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable(${TARGET}
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::Core
Qt5::DBus
Qt5::Network
diff --git a/src/extractor/CMakeLists.txt b/src/extractor/CMakeLists.txt
index 8c40b9b5..3615d5c7 100644
--- a/src/extractor/CMakeLists.txt
+++ b/src/extractor/CMakeLists.txt
@@ -23,7 +23,7 @@ add_executable(${TARGET}
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::Core
${Boost_LIBRARIES}
ldm-priv-common
diff --git a/src/uploads/daemon/CMakeLists.txt b/src/uploads/daemon/CMakeLists.txt
index 157c6fd6..3692d3c9 100644
--- a/src/uploads/daemon/CMakeLists.txt
+++ b/src/uploads/daemon/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(${TARGET}
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::Core
ldm-common
ldm-priv-common
diff --git a/src/uploads/priv/CMakeLists.txt b/src/uploads/priv/CMakeLists.txt
index dff67e35..672e49ef 100644
--- a/src/uploads/priv/CMakeLists.txt
+++ b/src/uploads/priv/CMakeLists.txt
@@ -47,7 +47,7 @@ set_target_properties(
)
target_link_libraries(${TARGET}
- ${GLOG_LIBRARIES}
+ glog::glog
Qt5::DBus
Qt5::Sql
ldm-common
--
2.47.1

View File

@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
revert = true;
hash = "sha256-xS0Wz6d+bZWj/kDGK2WhOduzyP4Rgz3n9n2XY1Zu5hE=";
})
# Fix compatibility with glog 0.7.x
# Remove when https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/29 merged & in release (vendored patch was manually backported)
./1001-treewide-Switch-to-glog-CMake-module.patch
];
postPatch = ''

View File

@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "standard-library";
version = "2.1.1";
version = "2.2";
src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
hash = "sha256-4HfwNAkIhk1yC/oSxZ30xilzUM5/22nzbUSqTjcW5Ng=";
hash = "sha256-/Fy5EOSbVNXt6Jq0yKSnlNPW4SYfn+eCTAYFnMZrbR0=";
};
nativeBuildInputs = [ (ghcWithPackages (self: [ self.filemanip ])) ];

View File

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.9.8";
version = "0.9.9";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = "aioairzone";
tag = version;
hash = "sha256-wqJpdD4zd5hToZJaacjhoHEC+rSyLjPs7vwwAN92xHM=";
hash = "sha256-K/QzoN08keaD5+o5HrKOwrNfIugg1GONdwT7RycOM18=";
};
build-system = [ setuptools ];

View File

@@ -4,13 +4,14 @@
fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "aiooui";
version = "0.1.7";
version = "0.1.9";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,22 +20,22 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "aiooui";
tag = "v${version}";
hash = "sha256-vnO3Lh+d/8mES2i4jKTH4RviURUFqb3Vj6u5sxUGf1o=";
hash = "sha256-tY8/hb3BpxzKM/IB7anfmqGcXK6FmiuoJVxqpFW1Maw=";
};
postPatch = ''
# Remove requirements and build part for the OUI data
substituteInPlace pyproject.toml \
--replace-fail "-v -Wdefault --cov=aiooui --cov-report=term-missing:skip-covered" "" \
--replace-fail 'script = "build_oui.py"' "" \
--replace-fail ", 'requests'" "" \
--replace-fail ", 'requests', 'aiohttp'" "" \
--replace-fail '"setuptools>=65.4.1", ' ""
'';
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
nativeCheckInputs = [
pytest-asyncio
pytest-cov-stub
pytestCheckHook
];
@@ -43,7 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Async OUI lookups";
homepage = "https://github.com/Bluetooth-Devices/aiooui";
changelog = "https://github.com/Bluetooth-Devices/aiooui/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/Bluetooth-Devices/aiooui/blob/${src.tag}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View File

@@ -0,0 +1,83 @@
{
argcomplete,
black,
buildPythonPackage,
fetchFromGitHub,
freezegun,
genson,
graphql-core,
httpx,
inflect,
isort,
jinja2,
lib,
openapi-spec-validator,
packaging,
poetry-core,
poetry-dynamic-versioning,
prance,
pytest-mock,
pytestCheckHook,
pydantic,
python3,
pyyaml,
toml,
}:
buildPythonPackage rec {
pname = "datamodel-code-generator";
version = "0.26.5";
pyproject = true;
src = fetchFromGitHub {
owner = "koxudaxi";
repo = "datamodel-code-generator";
tag = version;
hash = "sha256-CYNEpQFIWR7i7I7YJ5q/34KNhtQ7cjya97Z0fyeO5g8=";
};
pythonRelaxDeps = [ "inflect" ];
build-system = [
poetry-core
poetry-dynamic-versioning
];
dependencies = [
argcomplete
black
genson
graphql-core
httpx
inflect
isort
jinja2
openapi-spec-validator
packaging
pydantic
pyyaml
toml
];
nativeCheckInputs = [
freezegun
prance
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "datamodel_code_generator" ];
disabledTests = [
# remote testing, name resolution failure.
"test_openapi_parser_parse_remote_ref"
];
meta = {
description = "Pydantic model and dataclasses.dataclass generator for easy conversion of JSON, OpenAPI, JSON Schema, and YAML data sources";
homepage = "https://github.com/koxudaxi/datamodel-code-generator";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tochiaha ];
mainProgram = "datamodel-code-generator";
};
}

View File

@@ -7,21 +7,22 @@
defusedxml,
docker,
fetchFromGitHub,
hatch-vcs,
hatchling,
numpy,
pillow,
pkg-config,
pycountry,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
rustPlatform,
svg-py,
testfixtures,
xz,
}:
buildPythonPackage rec {
pname = "deebot-client";
version = "10.1.0";
version = "11.0.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -30,7 +31,12 @@ buildPythonPackage rec {
owner = "DeebotUniverse";
repo = "client.py";
tag = version;
hash = "sha256-qnXDr8+e13/VMFhFBbQJPdct5MjHwcBkLl+fo8xaEgY=";
hash = "sha256-G8NLirz81+b2YJBvxmfCEPpy2M9MMvs3n6JmdXR+3oc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src;
hash = "sha256-9rXd5FFR+Ma0LJfKXwkDqZp096PA34V7TzPe/tahE7c=";
};
pythonRelaxDeps = [
@@ -38,9 +44,17 @@ buildPythonPackage rec {
"defusedxml"
];
build-system = [
hatch-vcs
hatchling
build-system = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
xz
];
dependencies = [
@@ -61,6 +75,10 @@ buildPythonPackage rec {
testfixtures
];
preCheck = ''
rm -rf deebot_client
'';
pythonImportsCheck = [ "deebot_client" ];
disabledTests = [

View File

@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "demetriek";
version = "1.1.1";
version = "1.2.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-demetriek";
tag = "v${version}";
hash = "sha256-OTYQFw3Jy+sRGoPYVp5VKgCAzv9Gy2Fn2GjTGdsKjak=";
hash = "sha256-KqLkct4Kd8wa5eKYJJq1y/5z5PbO0XaK0aGzs3bm8fs=";
};
postPatch = ''

View File

@@ -34,7 +34,7 @@
buildPythonPackage rec {
pname = "django-filingcabinet";
version = "0-unstable-2024-11-15";
version = "0.17-unstable-2024-11-15";
pyproject = true;
src = fetchFromGitHub {
@@ -113,6 +113,8 @@ buildPythonPackage rec {
# playwright._impl._errors.TimeoutError: Locator.click: Timeout 30000ms exceeded
"test_sidebar_hide"
"test_show_search_bar"
# Unable to lauch browser
"test_document_viewer"
];
preCheck = ''
@@ -125,6 +127,7 @@ buildPythonPackage rec {
meta = {
description = "Django app that manages documents with pages, annotations and collections";
homepage = "https://github.com/okfde/django-filingcabinet";
changelog = "https://github.com/feincms/django-cabinet/blob/${version}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.onny ];
};

View File

@@ -0,0 +1,42 @@
{
buildPythonPackage,
coverage,
fetchPypi,
jsonschema,
lib,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "genson";
version = "1.3.0";
pyproject = true;
# Using Python repository source due to missing genson.schema in setup tools.
src = fetchPypi {
inherit pname version;
hash = "sha256-4C25rC4/0p5ltShvcTV2LizYqYZTfAdbBvxfFRcwjjc=";
};
build-system = [ setuptools ];
nativeCheckInputs = [
jsonschema
pytestCheckHook
];
disabledTests = [
"test_no_input"
];
pythonImportsCheck = [ "genson" ];
meta = {
description = "GenSON a JSON Schema generator built in Python";
homepage = "https://github.com/wolverdude/GenSON";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tochiaha ];
mainProgram = "genson";
};
}

View File

@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "imageio";
version = "2.36.1";
version = "2.37.0";
pyproject = true;
src = fetchFromGitHub {
owner = "imageio";
repo = "imageio";
tag = "v${version}";
hash = "sha256-jHy0w+tHjoYGTgkcIvy4FnjoZ1eJrVA3JrDYapkBLhY=";
hash = "sha256-/nxJxZrTYX7F2grafIWwx9SyfR47ZXyaUwPHMEOdKkI=";
};
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -88,20 +88,10 @@ buildPythonPackage rec {
pytestFlagsArray = [ "-m 'not needs_internet'" ];
preCheck = ''
export IMAGEIO_USERDIR="$TMP"
export HOME=$TMPDIR
export IMAGEIO_USERDIR=$(mktemp -d)
export HOME=$(mktemp -d)
'';
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# Segmentation fault
"test_bayer_write"
# RuntimeError: No valid H.264 encoder was found with the ffmpeg installation
"test_writer_file_properly_closed"
"test_writer_pixelformat_size_verbose"
"test_writer_ffmpeg_params"
"test_reverse_read"
];
meta = {
description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
homepage = "https://imageio.readthedocs.io";

View File

@@ -1,6 +1,5 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
@@ -43,6 +42,12 @@ buildPythonPackage rec {
url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch";
hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY=";
})
# fix invalid string escape sequences
(fetchpatch {
name = "fix-escape-sequences.patch";
url = "https://github.com/google/jaxopt/commit/f5bb530f5f000d0739c9b26eee2d32211eb99f40.patch";
hash = "sha256-E0ZXIfzWxKHuiBn4lAWf7AjNtll7OJU/NGZm6PTmhzo=";
})
];
build-system = [ setuptools ];
@@ -71,39 +76,25 @@ buildPythonPackage rec {
"jaxopt.tree_util"
];
disabledTests =
[
# https://github.com/google/jaxopt/issues/592
"test_solve_sparse"
disabledTests = [
# https://github.com/google/jaxopt/issues/592
"test_solve_sparse"
# AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06
# https://github.com/google/jaxopt/issues/618
"test_binary_logit_log_likelihood"
]
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# https://github.com/google/jaxopt/issues/577
"test_binary_logit_log_likelihood"
"test_solve_sparse"
"test_logreg_with_intercept_manual_loop3"
# https://github.com/google/jaxopt/issues/593
# Makes the test suite crash
"test_dtype_consistency"
# Flaky (AssertionError)
"test_inv_hessian_product_pytree3"
# AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06
# https://github.com/google/jaxopt/issues/618
"test_binary_logit_log_likelihood"
# https://github.com/google/jaxopt/issues/593
# Makes the test suite crash
"test_dtype_consistency"
# AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01
"test_multiclass_logreg6"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Fatal Python error: Aborted
"test_dtype_consistency"
# AssertionError (flaky numerical tests)
"test_logreg_with_intercept_manual_loop3"
"test_binary_logit_log_likelihood"
"test_inv_hessian_product_pytree3"
];
# AssertionError (flaky numerical tests)
"test_logreg_with_intercept_manual_loop3"
"test_inv_hessian_product_pytree3"
"test_multiclass_logreg6"
"test_Rosenbrock2"
"test_Rosenbrock5"
];
meta = {
homepage = "https://jaxopt.github.io";

View File

@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "knx-frontend";
version = "2024.12.26.233449";
version = "2025.1.18.164225";
pyproject = true;
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-PlV1CFUtKdUMXnnyeil6c+N7VBmsjmOSs8uYziGrZ9s=";
hash = "sha256-Q1y6hhOP+92BSo7FAJ01EarN57iuknqLQQhH7frhPn8=";
};
build-system = [ setuptools ];

View File

@@ -20,6 +20,8 @@ buildPythonPackage rec {
hash = "sha256-ggEbzN9FfqT968hgOblIh5dfVibzgUEc4SoZfBGOCwo=";
};
pythonRelaxDeps = [ "colorlog" ];
build-system = [ setuptools ];
dependencies = [

View File

@@ -0,0 +1,54 @@
{
buildPythonPackage,
fetchFromGitHub,
lib,
poetry-core,
pytest-cov-stub,
pytest-xdist,
pytestCheckHook,
requests,
}:
buildPythonPackage rec {
pname = "mficlient";
version = "0.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "uilibs";
repo = "mficlient";
tag = "v${version}";
hash = "sha256-gr9E+3qYD3usK2AAk+autfFQVPL3RDtjG7vvsmZui80=";
};
postPatch = ''
cat >> pyproject.toml << EOF
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
EOF
'';
build-system = [ poetry-core ];
dependencies = [
requests
];
pythonImportsCheck = [ "mficlient" ];
nativeCheckInputs = [
pytest-cov-stub
pytest-xdist
pytestCheckHook
];
meta = {
changelog = "https://github.com/uilibs/mficlient/blob/${src.tag}/CHANGELOG.md";
description = "Remote control client for Ubiquiti's UVC NVR";
homepage = "https://github.com/uilibs/mficlient";
license = lib.licenses.mit;
mainProgram = "mfi";
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "nhc";
version = "0.3.3";
version = "0.3.4";
pyproject = true;
src = fetchFromGitHub {
owner = "vandeurenglenn";
repo = "nhc";
tag = "v${version}";
hash = "sha256-s3DVdnjhRUZRG/LwKwOuZSiNtzpccBtHl/PNvux/NwQ=";
hash = "sha256-TSfOcSeedr0cSDHo1bqftUOZ3AeCW3Zgb80IBv3eerM=";
};
build-system = [ setuptools ];

View File

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "onvif-zeep-async";
version = "3.1.13";
version = "3.2.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "openvideolibs";
repo = "python-onvif-zeep-async";
tag = "v${version}";
hash = "sha256-Z9LtKcgyebmdrChRz0QwiQdnrtcIVeCtKQAvL9gBMY4=";
hash = "sha256-guxep37d/MT9dp+sugfH0Ik2aIiwBSpx8x9Jj7OlNvw=";
};
build-system = [ setuptools ];

View File

@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyhiveapi";
version = "0.5.16";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Pyhass";
repo = "Pyhiveapi";
tag = "v${version}";
hash = "sha256-gPou5KGLFEFP29qSpRg+6sCiXOwfoF1gyhBVERYJ1LI=";
hash = "sha256-/Q6nQb6JyjjWJv7Yj+EJdqOMy+j3cYPIkRpXa3Q48Oo=";
};
postPatch = ''

View File

@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "sagemaker-core";
version = "1.0.17";
version = "1.0.19";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "sagemaker-core";
tag = "v${version}";
hash = "sha256-zRdY0LWIOMY6fBqLje6WFYci46WlcxliI8PFAipiIuw=";
hash = "sha256-y5nD5PnLx+c7fSkjDdqFMI9aBHIgrtqdkft00muFr6k=";
};
build-system = [

View File

@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "simple-parsing";
version = "0.1.6";
version = "0.1.7";
pyproject = true;
src = fetchFromGitHub {
owner = "lebrice";
repo = "SimpleParsing";
tag = "v${version}";
hash = "sha256-RDS1sWzaQqXp/0a7dXlUHnd6z+GTIpUN1MnUCTI9LGw=";
hash = "sha256-wHk3osr5CNmA/g9ipLy1dgvJoMy1zE/BAGD9ZATE+tc=";
};
build-system = [
@@ -67,10 +67,18 @@ buildPythonPackage rec {
];
disabledTests = [
# Expected: OrderedDict([('a', 1), ('b', 2), ('c', 5), ('d', 6), ('e', 7)])
# Got: OrderedDict({'a': 1, 'b': 2, 'c': 5, 'd': 6, 'e': 7})
# https://github.com/lebrice/SimpleParsing/issues/326
"simple_parsing.utils.dict_union"
# AssertionError
# https://github.com/lebrice/SimpleParsing/issues/338
"test_bool_args_in_help"
"test_desc_from_cls_docstring"
"test_docstring_builds_upon_bases"
"test_help_string"
"test_help_string_displays_default_factory_arguments"
"test_help_takes_value_from_docstring"
"test_issue_48"
"test_running_example_outputs_expected_without_arg"
"test_subgroup_partial_with_nested_field"
"test_weird_docstring_with_field_like"
];
meta = {

View File

@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "treescope";
version = "0.1.7";
version = "0.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "google-deepmind";
repo = "treescope";
tag = "v${version}";
hash = "sha256-fDwiKKXgisJ4Z/CBv4Vwtd7QaGscu5teZo11mSGZjbE=";
hash = "sha256-/rSQUmmfMPP7sZ6avd9bc4lSW/sHLXLEKKCJdXjBTB4=";
};
build-system = [ flit-core ];
@@ -56,9 +56,9 @@ buildPythonPackage rec {
];
meta = {
description = "An interactive HTML pretty-printer for machine learning research in IPython notebooks";
description = "Interactive HTML pretty-printer for machine learning research in IPython notebooks";
homepage = "https://github.com/google-deepmind/treescope";
changelog = "https://github.com/google-deepmind/treescope/releases/tag/${src.tag}";
changelog = "https://github.com/google-deepmind/treescope/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};

View File

@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2025.1.2";
version = "2025.1.3";
components = {
"3_day_blinds" =
ps: with ps; [
@@ -3419,7 +3419,8 @@
];
"mfi" =
ps: with ps; [
]; # missing inputs: mficlient
mficlient
];
"microbees" =
ps: with ps; [
]; # missing inputs: microBeesPy
@@ -6964,6 +6965,7 @@
"meteo_france"
"meteoclimatic"
"metoffice"
"mfi"
"microsoft_face"
"microsoft_face_detect"
"microsoft_face_identify"

View File

@@ -1,47 +0,0 @@
{
lib,
buildHomeAssistantComponent,
fetchFromGitHub,
async-timeout,
music-assistant-client,
pytestCheckHook,
pytest-asyncio,
pytest-cov-stub,
pytest-homeassistant-custom-component,
zeroconf,
}:
buildHomeAssistantComponent rec {
owner = "music-assistant";
domain = "mass";
version = "2024.12.1";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "hass-music-assistant";
rev = version;
hash = "sha256-e2e59oG0PeQdq/Vg4ovjxpOQTXrDfQxFVkWZ63QkfRw=";
};
dependencies = [
async-timeout
music-assistant-client
];
ignoreVersionRequirement = [ "music-assistant-client" ];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pytest-cov-stub
pytest-homeassistant-custom-component
zeroconf
];
meta = with lib; {
description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players";
homepage = "https://github.com/music-assistant/hass-music-assistant";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

View File

@@ -289,7 +289,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2025.1.2";
hassVersion = "2025.1.3";
in
python.pkgs.buildPythonApplication rec {
@@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-dEjTSByjv8+YwAcztFwCvQp+GWcS0QZxP1norxd8MmY=";
hash = "sha256-JQAMh+ydcWSyKqbSt9/exf1/d3+2Oo2jfXw+5WsFYbc=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-AO2n3t2QobFuN2IrlYcwBA4LRxsMr7B/T0dc2IWZrfg=";
hash = "sha256-PTfdEQh8B91upX15PbcwalhpoEooEKxhYxmabyWBGrk=";
};
build-system = with python.pkgs; [

View File

@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
version = "0.13.202";
version = "0.13.204";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
rev = "refs/tags/${version}";
hash = "sha256-MoOIEoJna3nROYYvMzVSV6qpQN/qoDumr3sDOrECZh4=";
hash = "sha256-yYcUQwf9DDeJvnkmPPvESJdXt7VY/TVYD6UoguXta5s=";
};
build-system = [ setuptools ];

View File

@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2025.1.2";
version = "2025.1.3";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-35JzLlzx7+zQ6/RLqNwlqfAKAZ/axPa7lwFc6xtQbzQ=";
hash = "sha256-4cCwhumj6VFSvuWtCqpQ4AzbgK4LmWSM9GCqkI4kZpg=";
};
build-system = [

View File

@@ -21,6 +21,7 @@ let
matrix = [
pydantic
];
mopeka = getComponentDeps "switchbot";
onboarding = [
pymetno
radios

View File

@@ -45,6 +45,7 @@ PKG_PREFERENCES = {
"numpy": "numpy",
"ollama-hass": "ollama",
"paho-mqtt": "paho-mqtt_1",
"pyhive-integration": "pyhiveapi", # https://github.com/home-assistant/core/pull/135482
"pysuezV2": "pysuez",
"sentry-sdk": "sentry-sdk",
"slackclient": "slack-sdk",

View File

@@ -12,7 +12,6 @@
freetype,
glib,
glm,
glog,
libapparmor,
libdrm,
libepoxy,
@@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
freetype
glib
glm
glog
libdrm
libepoxy
libevdev
@@ -159,7 +157,12 @@ stdenv.mkDerivation (finalAttrs: {
# BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such
# https://github.com/canonical/mir/pull/1947#issuecomment-811810872
(lib.cmakeBool "MIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN" true)
(lib.cmakeFeature "MIR_EXCLUDE_TESTS" (lib.strings.concatStringsSep ";" [ ]))
(lib.cmakeFeature "MIR_EXCLUDE_TESTS" (
lib.strings.concatStringsSep ";" [
# https://github.com/canonical/mir/issues/3716#issuecomment-2580698552
"UdevWrapperTest.UdevMonitorDoesNotTriggerBeforeEnabling"
]
))
# These get built but don't get executed by default, yet they get installed when tests are enabled
(lib.cmakeBool "MIR_BUILD_PERFORMANCE_TESTS" false)
(lib.cmakeBool "MIR_BUILD_PLATFORM_TEST_HARNESS" false)

View File

@@ -29,6 +29,14 @@ in
hash = "sha256-k+51piPQandbHdm+ioqpBrb+C7Aqi2kugchAehZ1aiU=";
})
# Always depend on epoxy
# Remove when version > 2.15.0
(fetchpatch {
name = "0003-mir-cmake-always-require-epoxy.patch";
url = "https://github.com/canonical/mir/commit/171c42ac3929f946a70505ee42be0ce8220f245a.patch";
hash = "sha256-QuVZBcHSn/DK+xbjM36Y89+w22vk7NRV4MkbjgvS28A=";
})
# Fix ignored return value of std::lock_guard
# Remove when version > 2.15.0
# Was changed as part of the big platform API change, no individual upstream commit with this fix
@@ -44,6 +52,33 @@ in
# Partially done in https://github.com/canonical/mir/pull/3192, though one of the calloc was fixed earlier
# when some code was moved into that file
./1003-mir-2_15-calloc-args-in-right-order.patch
# Drop gflags & glog dependencies
# Remove when version > 2.16.4
(fetchpatch {
name = "0101-Drop-unused-dependency-on-gflags.patch";
url = "https://github.com/canonical/mir/commit/15a40638e5e9c4b6a11b7fa446ad31e190f485e7.patch";
includes = [
"CMakeLists.txt"
"examples/mir_demo_server/CMakeLists.txt"
"examples/mir_demo_server/glog_logger.cpp"
];
hash = "sha256-qIsWCOs6Ap0jJ2cpgdO+xJHmSqC6zP+J3ALAfmlA6Vc=";
})
(fetchpatch {
name = "0102-Drop-the-glog-example.patch";
url = "https://github.com/canonical/mir/commit/8407da28ddb9a535df2775f224bf5143e8770d52.patch";
includes = [
"CMakeLists.txt"
"examples/mir_demo_server/CMakeLists.txt"
"examples/mir_demo_server/glog_logger.cpp"
"examples/mir_demo_server/glog_logger.h"
"examples/mir_demo_server/server_example.cpp"
"examples/mir_demo_server/server_example_log_options.cpp"
"examples/mir_demo_server/server_example_log_options.h"
];
hash = "sha256-jVhVR7wZZZGRS40z+HPNoGBLHulvE1nHRKgYhQ6/g9M=";
})
];
};
}

View File

@@ -1198,6 +1198,7 @@ mapAliases {
rustic-rs = rustic; # Added 2024-08-02
rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17
rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17
ryujinx-greemdev = ryubing; # Added 2025-01-20
# The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
# due to it being inside the linuxPackagesFor function.

View File

@@ -2997,6 +2997,8 @@ self: super: with self; {
datalad-next = callPackage ../development/python-modules/datalad-next { };
datamodel-code-generator = callPackage ../development/python-modules/datamodel-code-generator { };
datamodeldict = callPackage ../development/python-modules/datamodeldict { };
datapoint = callPackage ../development/python-modules/datapoint { };
@@ -5144,6 +5146,8 @@ self: super: with self; {
gensim = callPackage ../development/python-modules/gensim { };
genson = callPackage ../development/python-modules/genson { };
gentools = callPackage ../development/python-modules/gentools { };
genzshcomp = callPackage ../development/python-modules/genzshcomp { };
@@ -8160,6 +8164,8 @@ self: super: with self; {
mf2py = callPackage ../development/python-modules/mf2py { };
mficlient = callPackage ../development/python-modules/mficlient { };
mhcflurry = callPackage ../development/python-modules/mhcflurry { };
mhcgnomes = callPackage ../development/python-modules/mhcgnomes { };