Merge remote-tracking branch 'origin/staging-next' into staging

This commit is contained in:
K900
2026-01-25 21:09:20 +03:00
129 changed files with 1597 additions and 767 deletions
+1 -1
View File
@@ -158,7 +158,7 @@ tl,,,,,,mephistophiles
toml-edit,,,,,5.1,mrcjkb
tree-sitter-http,,,,0.0.33-1,,
tree-sitter-norg,,,,,5.1,mrcjkb
tree-sitter-orgmode,,,,,,
tree-sitter-orgmode,,,,,5.1,
vstruct,,,,,,
vusted,,,,,,
xml2lua,,,,,,teto
1 name rockspec ref server version luaversion maintainers
158 toml-edit 5.1 mrcjkb
159 tree-sitter-http 0.0.33-1
160 tree-sitter-norg 5.1 mrcjkb
161 tree-sitter-orgmode 5.1
162 vstruct
163 vusted
164 xml2lua teto
@@ -17,6 +17,7 @@ let
concatMapStringsSep
types
literalExpression
optional
;
pdsadminWrapper =
@@ -32,7 +33,7 @@ let
${getExe pkgs.bluesky-pdsadmin} "$@"
'';
in
# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
# All defaults are from https://github.com/bluesky-social/pds/blob/9a72155fee4e7e1de0e0add5454c5571b89e05e0/installer.sh
{
imports = [
(lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])
@@ -130,6 +131,12 @@ in
default = "true";
description = "Enable logging";
};
PDS_RATE_LIMITS_ENABLED = mkOption {
type = types.nullOr types.str;
default = "true";
description = "Enable rate limiting";
};
};
};
@@ -162,19 +169,27 @@ in
};
pdsadmin = {
enable = mkOption {
type = types.bool;
default = false;
defaultText = false;
description = "Add pdsadmin script to PATH";
};
};
goat = {
enable = mkOption {
type = types.bool;
default = cfg.enable;
defaultText = literalExpression "config.services.bluesky-pds.enable";
description = "Add pdsadmin script to PATH";
description = "Add goat to PATH";
};
};
};
config = mkIf cfg.enable {
environment = mkIf cfg.pdsadmin.enable {
systemPackages = [ pdsadminWrapper ];
};
environment.systemPackages =
optional cfg.pdsadmin.enable pdsadminWrapper ++ optional cfg.goat.enable pkgs.atproto-goat;
systemd.services.bluesky-pds = {
description = "bluesky pds";
+1 -1
View File
@@ -1389,7 +1389,7 @@ in
rosenpass = runTest ./rosenpass.nix;
roundcube = runTest ./roundcube.nix;
routinator = handleTest ./routinator.nix { };
rqbit = handleTest ./rqbit.nix { };
rqbit = runTest ./rqbit.nix;
rshim = handleTest ./rshim.nix { };
rspamd = handleTest ./rspamd.nix { };
rspamd-trainer = runTest ./rspamd-trainer.nix;
+25 -27
View File
@@ -1,30 +1,28 @@
import ./make-test-python.nix (
{ pkgs, ... }:
let
port = 3030;
in
{
name = "rqbit";
meta = {
maintainers = with pkgs.lib.maintainers; [ CodedNil ];
{ pkgs, ... }:
let
port = 3030;
in
{
name = "rqbit";
meta = {
maintainers = with pkgs.lib.maintainers; [ CodedNil ];
};
nodes.machine =
{ pkgs, ... }:
{
services.rqbit = {
httpPort = port;
enable = true;
openFirewall = true;
};
};
nodes.machine =
{ pkgs, ... }:
{
services.rqbit = {
httpPort = port;
enable = true;
openFirewall = true;
};
};
testScript = /* python */ ''
machine.start()
machine.wait_for_unit("rqbit.service")
machine.wait_for_open_port(${toString port})
testScript = /* python */ ''
machine.start()
machine.wait_for_unit("rqbit.service")
machine.wait_for_open_port(${toString port})
machine.succeed("curl --fail http://localhost:${toString port}")
'';
}
)
machine.succeed("curl --fail http://localhost:${toString port}")
'';
}
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2026-01-18";
version = "0-unstable-2026-01-24";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed";
hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI=";
rev = "bab01f1b162ed76dde584b9a1f9f327fecbf5cb5";
hash = "sha256-SXI6EmvpQ80nkzxswBrvCZTVi8qW6R5097D4aZTSie4=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -28,18 +28,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.35.1";
version = "1.35.2";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-1p2zbzQLza8w+hu+5OjPr+Lh6q6Kh9HdVxFkuCl2x8o=";
hash = "sha256-YreeoI9ct3Gt0za3bW4cFP8mA3mrgpVnHVUzfX1m5CI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-OlXkshfEXtY6fDBqhEJQhWhPjwQ5ofDIZ9IuchchKxk=";
hash = "sha256-1TxACD4xXZ3BfVdoQUCzWe5Ovv0tKw6ALBw0+tRLOaQ=";
};
postPatch = ''
+21 -17
View File
@@ -1,31 +1,21 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "brotab";
version = "1.4.2";
version = "1.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "balta2ar";
repo = "brotab";
tag = version;
hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28=";
};
patches = [
# https://github.com/balta2ar/brotab/pull/102
(fetchpatch {
name = "remove-unnecessary-pip-import.patch";
url = "https://github.com/balta2ar/brotab/commit/825cd48f255c911aabbfb495f6b8fc73f27d3fe5.patch";
hash = "sha256-IN28AOLPKPUc3KkxIGFMpZNNXA1+O12NxS+Hl4KMXbg=";
})
];
build-system = with python3Packages; [
setuptools
];
@@ -34,14 +24,28 @@ python3Packages.buildPythonApplication rec {
flask
psutil
requests
werkzeug
setuptools
];
postPatch = ''
substituteInPlace requirements/base.txt \
--replace-fail "Flask==2.0.2" "Flask>=2.0.2" \
--replace-fail "psutil==5.8.0" "psutil>=5.8.0" \
--replace-fail "requests==2.24.0" "requests>=2.24.0"
pythonRelaxDeps = [
"flask"
"psutil"
"requests"
"werkzeug"
"setuptools"
];
postInstall = ''
substituteInPlace $out/config/*json \
--replace-fail '$PWD/brotab_mediator.py' $out/bin/bt_mediator
mkdir -p $out/lib/mozilla/native-messaging-hosts
mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts
mkdir -p $out/etc/chromium/native-messaging-hosts
mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts
mkdir -p $out/lib/albert
mv $out/config/Brotab.qss $out/lib/albert
rmdir $out/config
'';
__darwinAllowLocalNetworking = true;
@@ -2,23 +2,26 @@
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "catppuccinifier-cli";
version = "9.0.0";
version = "9.1.0";
src = fetchFromGitHub {
owner = "lighttigerXIV";
repo = "catppuccinifier";
tag = finalAttrs.version;
hash = "sha256-YlHb8gueKyXB2JJeRJmo8oFLOeYcmthup4n4BkEHNTA=";
hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE=";
};
sourceRoot = "${finalAttrs.src.name}/src/catppuccinifier-cli";
cargoHash = "sha256-mIzRK4rqD8ON8LqkG3QhOseZLM5+Rr1Rhj1uuu+KRMI=";
passthru.updateScript = nix-update-script { };
meta = {
description = "Apply catppuccin flavors to your wallpapers";
homepage = "https://github.com/lighttigerXIV/catppuccinifier";
+3 -1
View File
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
maintainers = [ ];
# The last successful Darwin Hydra build was in 2023
broken = stdenv.hostPlatform.isDarwin;
# On linux fails to build on gcc-15, needs porting to c23, but
# the upstream code did not update since 2006.
broken = true;
};
}
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "cdncheck";
version = "1.2.19";
version = "1.2.20";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${finalAttrs.version}";
hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU=";
hash = "sha256-M+WlXFTw6DMV197aJh7UUIDsRiGeobXR5biEjRtASKE=";
};
vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA=";
vendorHash = "sha256-sVCmEMT6Y/9EPCbiUlstAw8FS4y+afeYeWNhT8aBXSE=";
subPackages = [ "cmd/cdncheck/" ];
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codebook";
version = "0.3.28";
version = "0.3.29";
src = fetchFromGitHub {
owner = "blopker";
repo = "codebook";
tag = "v${finalAttrs.version}";
hash = "sha256-iYQy0uupRoNkBwlvykicGcRIpZftrpDOQaKzFoG+JgI=";
hash = "sha256-jGI0a2rb0ljDorqq+g9PbFO4UfCUrtgX47tVNq3AHhs=";
};
buildAndTestSubdir = "crates/codebook-lsp";
cargoHash = "sha256-jW2HQxoTZ+1x2j+fVHm1K1TU9TB9wGuEm7D9Fn2Xnac=";
cargoHash = "sha256-2ZPB5sGFhewiJX70IMVygbyPUV1AYe6pcjmTIK0gvhc=";
CARGO_PROFILE_RELEASE_LTO = "fat";
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
@@ -30,14 +30,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "debian-devscripts";
version = "2.26.4";
version = "2.26.5";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "devscripts";
tag = "v${finalAttrs.version}";
hash = "sha256-QGveq9PZfy/m+ah4gBvZDMkVWS50oj1f4SJsKcCKGug=";
hash = "sha256-Fwl7UGIe0DcqKRWC/rm1Sa1DfxX4I35yJVSmfxERK6k=";
};
patches = [
+13 -2
View File
@@ -128,7 +128,7 @@ let
src = fetchHex {
pkg = "p1_pgsql";
version = "1.1.38";
sha256 = "";
sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4=";
};
beamDeps = [ xmpp ];
};
@@ -148,7 +148,7 @@ let
src = fetchHex {
pkg = "p1_mysql";
version = "1.0.27";
sha256 = "";
sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps=";
};
beamDeps = [ ];
};
@@ -262,6 +262,17 @@ let
stun
];
};
erlydtl = builder {
name = "erlydtl";
version = "git";
src = fetchFromGitHub {
owner = "erlydtl";
repo = "erlydtl";
rev = "aae414692b6052e96d890e03bbeeeca0f4dc01c2";
sha256 = "00p194jgmvzqza7xr7fdm2n091ymkyy66aj4gc82n0kzdlh03vbm";
};
beamDeps = [ ];
};
eredis = builder {
name = "eredis";
version = "1.7.1";
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt
#shellcheck shell=bash
set -eu -o pipefail
@@ -0,0 +1,166 @@
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index f4bc16e..cae6562 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -545,6 +545,17 @@ dependencies = [
"brotli-decompressor",
]
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
[[package]]
name = "brotli-decompressor"
version = "4.0.1"
@@ -690,16 +701,16 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.18.1"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
dependencies = [
"camino",
"cargo-platform",
"semver",
"serde",
"serde_json",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
]
[[package]]
@@ -2661,7 +2672,19 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
dependencies = [
- "jsonptr",
+ "jsonptr 0.4.7",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.63",
+]
+
+[[package]]
+name = "json-patch"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+dependencies = [
+ "jsonptr 0.6.3",
"serde",
"serde_json",
"thiserror 1.0.63",
@@ -2678,6 +2701,16 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "jsonptr"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "keyboard-types"
version = "0.7.0"
@@ -4614,13 +4647,15 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.114"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
dependencies = [
"itoa 1.0.10",
- "ryu",
+ "memchr",
"serde",
+ "serde_core",
+ "zmij",
]
[[package]]
@@ -5237,7 +5272,7 @@ dependencies = [
"dirs",
"glob",
"heck 0.5.0",
- "json-patch",
+ "json-patch 2.0.0",
"schemars",
"semver",
"serde",
@@ -5255,9 +5290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
dependencies = [
"base64 0.22.1",
- "brotli",
+ "brotli 6.0.0",
"ico",
- "json-patch",
+ "json-patch 2.0.0",
"plist",
"png",
"proc-macro2",
@@ -5573,18 +5608,19 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "2.0.1"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
+checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
dependencies = [
- "brotli",
+ "brotli 7.0.0",
"cargo_metadata",
"ctor",
"dunce",
"glob",
"html5ever",
+ "http 1.1.0",
"infer",
- "json-patch",
+ "json-patch 3.0.1",
"kuchikiki",
"log",
"memchr",
@@ -5599,7 +5635,7 @@ dependencies = [
"serde_json",
"serde_with",
"swift-rs",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
"toml 0.8.2",
"url",
"urlpattern",
@@ -7031,6 +7067,12 @@ dependencies = [
"zstd",
]
+[[package]]
+name = "zmij"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
+
[[package]]
name = "zopfli"
version = "0.8.1"
+48 -26
View File
@@ -3,54 +3,73 @@
stdenv,
rustPlatform,
fetchFromGitHub,
pnpm_9,
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
cargo-tauri_1,
pnpm_10,
pnpmConfigHook,
cargo-tauri,
jq,
moreutils,
pkg-config,
wrapGAppsHook3,
makeBinaryWrapper,
openssl,
libsoup_2_4,
# webkitgtk_4_0,
webkitgtk_4_1,
gst_all_1,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
let
pnpm = pnpm_10;
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "en-croissant";
version = "0.11.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "franciscoBSalgueiro";
repo = "en-croissant";
tag = "v${version}";
hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-Ef6O8C1PPjCmF5lashpBQXWwjsEEKCl5R98QMOFDIBM=";
};
pnpmDeps = fetchPnpmDeps {
inherit
inherit (finalAttrs)
pname
version
src
;
pnpm = pnpm_9;
fetcherVersion = 1;
hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
inherit pnpm;
fetcherVersion = 2;
hash = "sha256-p2j886NRBw/8c2UJ94o6w7YtKnOfm7hU9SgEUrzAwco=";
};
cargoPatches = [
# Bump the tauri-utils package to at least 2.1.0, to fix resource path resolution on NixOS.
./en-croissant-update-tauri-utils.patch
];
postPatch = ''
jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
cargoRoot = "src-tauri";
cargoHash = "sha256-6cBGOdJ7jz+mOl2EEXxoLNeX9meW+ybQxAxnnHAplIc=";
cargoHash = "sha256-cTb6nKHlazyOu3cpwAAp20j3QmrDxC507ZRpYT5fgQs=";
buildAndTestSubdir = cargoRoot;
buildAndTestSubdir = finalAttrs.cargoRoot;
nativeBuildInputs = [
pnpmConfigHook
pnpm_9
nodejs
cargo-tauri_1.hook
pnpm
pnpmConfigHook
cargo-tauri.hook
jq
moreutils
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
@@ -58,12 +77,12 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
openssl
libsoup_2_4
# webkitgtk_4_0
webkitgtk_4_1
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
];
doCheck = false; # many scoring tests fail
@@ -72,14 +91,17 @@ rustPlatform.buildRustPackage rec {
makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant
'';
passthru.updateScript = nix-update-script { };
meta = {
# webkitgtk_4_0 was removed
broken = true;
description = "Ultimate Chess Toolkit";
homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
license = lib.licenses.gpl3Only;
mainProgram = "en-croissant";
maintainers = with lib.maintainers; [ tomasajt ];
maintainers = with lib.maintainers; [
tomasajt
snu
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})
+8 -8
View File
@@ -6,25 +6,25 @@
nix-update-script,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "newt";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "fosrl";
repo = "newt";
tag = version;
hash = "sha256-ndgigIk/3/cPZaJHfxWh6XvtAJe3S57sEwNTMBH0lSE=";
tag = finalAttrs.version;
hash = "sha256-Ya+OVSChGmiZ8JTAfl/im8fOhLCC+r6JKSlH+CnSwP8=";
};
vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
vendorHash = "sha256-Sib6AUCpMgxlMpTc2Esvs+UU0yduVOxWUgT44FHAI+k=";
nativeInstallCheckInputs = [ versionCheckHook ];
ldflags = [
"-s"
"-w"
"-X=main.newtVersion=${version}"
"-X=main.newtVersion=${finalAttrs.version}"
];
doInstallCheck = true;
@@ -36,7 +36,7 @@ buildGoModule rec {
meta = {
description = "Tunneling client for Pangolin";
homepage = "https://github.com/fosrl/newt";
changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}";
changelog = "https://github.com/fosrl/newt/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
fab
@@ -45,4 +45,4 @@ buildGoModule rec {
];
mainProgram = "newt";
};
}
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "goda";
version = "0.7.1";
version = "0.8.1";
src = fetchFromGitHub {
owner = "loov";
repo = "goda";
rev = "v${version}";
hash = "sha256-byRficALfYADK2lXskAvYeLxwrzOQXACTLlDRrMoHrw=";
hash = "sha256-Cwt2tIP8S+76meuUT/GDUcMGKhJKBg3qGFwen2sEG8I=";
};
vendorHash = "sha256-AkO3Ag2FiAC46ZXmG3mVhhWpcaw/Z3oik2cyGmoJFpc=";
vendorHash = "sha256-ZDiDAabLUGa/NFs2EQpwWAd8ypxUZ32I8AOeYCm/ntA=";
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -20,15 +20,15 @@
buildGoModule rec {
pname = "gonic";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "sentriz";
repo = "gonic";
rev = "v${version}";
sha256 = "sha256-la3xBECo4zZfkp5BlXuUzFEUGtxMl8ZAQdwgjFXIuSM=";
sha256 = "sha256-llNKCxVrsDmi5a33NoAPEyJu+728gFQcAItPk2IBdwo=";
};
vendorHash = "sha256-HrYS7c0MtiOYRyiSg7eLbiSIUkHeRikJ0Rwf4EoZIsQ=";
vendorHash = "sha256-uVZ0Q1nrE7DLurW4fldsr3yyz80J6ONiPjLXHXHDGlg=";
# TODO(Profpatsch): write a test for transcoding support,
# since it is prone to break
+11
View File
@@ -96,6 +96,9 @@
# For QT support
qt6,
# Create a symlink at $out/bin/google-chrome
withSymlink ? true,
}:
let
@@ -268,6 +271,10 @@ let
runHook postInstall
'';
postInstall = lib.optionalString withSymlink ''
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
'';
});
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -305,6 +312,10 @@ let
--add-flags ${lib.escapeShellArg commandLineArgs}
runHook postInstall
'';
postInstall = lib.optionalString withSymlink ''
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
'';
});
passthru.updateScript = ./update.sh;
+3 -3
View File
@@ -16,14 +16,14 @@ let
in
stdenv.mkDerivation rec {
pname = "gurobi";
version = "13.0.0";
version = "13.0.1";
src = fetchurl {
url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz";
hash =
{
aarch64-linux = "sha256-0wFhMzLK1QViDc0ZLM/oVemtRW0g+FRJRFFOL/eiOFE=";
x86_64-linux = "sha256-mEVUVXCeizSzQDLtkNS/EkaxT0MToxL3x3UGb/XB9lI=";
aarch64-linux = "sha256-MQDqu95e+fJ00FGtYVw2FlkZ6uhl5eTFefpsA0ti+jI=";
x86_64-linux = "sha256-7GIyF6xfoGV3madS7XwCshQfu5wP80Ep1uH4yaj+Ttg=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
+2
View File
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
libXtst
];
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
makeFlags = [
"sysconfdir=/etc"
"ETCDIR=/etc"
@@ -7,15 +7,15 @@
}:
let
timestamp = "202511261751";
timestamp = "202601131729";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jdt-language-server";
version = "1.54.0";
version = "1.55.0";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
hash = "sha256-GikaJpvYizxASCGRIpYaUuyAhyr7x6PzQnCyznf3oUw=";
hash = "sha256-kGJ8nwNwTbtATzdlFiXQdRwHirdTQkYCPVOtzqFBG5E=";
};
sourceRoot = ".";
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "jellyfin-tui";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "dhonus";
repo = "jellyfin-tui";
tag = "v${version}";
hash = "sha256-AzeIoPdFfuzDrSPcAWqYq9sTHpLR222cz7BMHgVpmNA=";
hash = "sha256-D3AzGrh04D05+v+t3gVZU68KlHM9HbaAx5dY2utJeFU=";
};
cargoHash = "sha256-a08yTZAzBSldSJ+TulU10aF+wLYCAxCA4WRMNfZOWFw=";
cargoHash = "sha256-u8W67NYHZh798bgGfwpXhQxZ/BZFUCZ+gWAr5Pv/W8M=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
@@ -0,0 +1,398 @@
From 9228741450f627da1dba800b44da03db8df44b32 Mon Sep 17 00:00:00 2001
From: Samuel Tam <samuel.tam@expressvpn.com>
Date: Fri, 9 Jan 2026 18:12:12 +0800
Subject: [PATCH] ARM64 ASM: Darwin specific address calc fix
Don't use ':lo12:' in Darwin specific address calculation code.
@PAGEOFF is indicating this.
---
wolfcrypt/src/port/arm/armv8-mlkem-asm.S | 74 +++++++++++------------
wolfcrypt/src/port/arm/armv8-sha3-asm.S | 4 +-
wolfcrypt/src/port/arm/armv8-sha512-asm.S | 8 +--
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
index a45475c..1ded4af 100644
--- a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
+++ b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
@@ -168,21 +168,21 @@ _mlkem_ntt:
add x2, x2, :lo12:L_mlkem_aarch64_zetas
#else
adrp x2, L_mlkem_aarch64_zetas@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_aarch64_zetas_qinv
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
#else
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
add x1, x0, #0x100
ldr q4, [x4]
@@ -1562,21 +1562,21 @@ _mlkem_invntt:
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
#else
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
#else
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
add x1, x0, #0x100
ldr q8, [x4]
@@ -3013,21 +3013,21 @@ _mlkem_ntt_sqrdmlsh:
add x2, x2, :lo12:L_mlkem_aarch64_zetas
#else
adrp x2, L_mlkem_aarch64_zetas@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_aarch64_zetas_qinv
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
#else
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
add x1, x0, #0x100
ldr q4, [x4]
@@ -4195,21 +4195,21 @@ _mlkem_invntt_sqrdmlsh:
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
#else
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
#else
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
add x1, x0, #0x100
ldr q8, [x4]
@@ -5532,14 +5532,14 @@ _mlkem_basemul_mont:
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
#else
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q1, [x4]
ldp q2, q3, [x1]
@@ -6230,14 +6230,14 @@ _mlkem_basemul_mont_add:
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
#else
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_aarch64_consts
add x4, x4, :lo12:L_mlkem_aarch64_consts
#else
adrp x4, L_mlkem_aarch64_consts@PAGE
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q1, [x4]
ldp q2, q3, [x1]
@@ -6991,7 +6991,7 @@ _mlkem_csubq_neon:
add x1, x1, :lo12:L_mlkem_aarch64_q
#else
adrp x1, L_mlkem_aarch64_q@PAGE
- add x1, x1, :lo12:L_mlkem_aarch64_q@PAGEOFF
+ add x1, x1, L_mlkem_aarch64_q@PAGEOFF
#endif /* __APPLE__ */
ldr q20, [x1]
ld4 {v0.8h, v1.8h, v2.8h, v3.8h}, [x0], #0x40
@@ -7172,7 +7172,7 @@ _mlkem_add_reduce:
add x2, x2, :lo12:L_mlkem_aarch64_consts
#else
adrp x2, L_mlkem_aarch64_consts@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x2]
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
@@ -7363,7 +7363,7 @@ _mlkem_add3_reduce:
add x3, x3, :lo12:L_mlkem_aarch64_consts
#else
adrp x3, L_mlkem_aarch64_consts@PAGE
- add x3, x3, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x3, x3, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x3]
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
@@ -7594,7 +7594,7 @@ _mlkem_rsub_reduce:
add x2, x2, :lo12:L_mlkem_aarch64_consts
#else
adrp x2, L_mlkem_aarch64_consts@PAGE
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x2]
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
@@ -7785,7 +7785,7 @@ _mlkem_to_mont:
add x1, x1, :lo12:L_mlkem_aarch64_consts
#else
adrp x1, L_mlkem_aarch64_consts@PAGE
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x1]
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
@@ -7999,7 +7999,7 @@ _mlkem_to_mont_sqrdmlsh:
add x1, x1, :lo12:L_mlkem_aarch64_consts
#else
adrp x1, L_mlkem_aarch64_consts@PAGE
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x1]
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
@@ -8226,21 +8226,21 @@ _mlkem_to_msg_neon:
add x2, x2, :lo12:L_mlkem_to_msg_low
#else
adrp x2, L_mlkem_to_msg_low@PAGE
- add x2, x2, :lo12:L_mlkem_to_msg_low@PAGEOFF
+ add x2, x2, L_mlkem_to_msg_low@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_to_msg_high
add x3, x3, :lo12:L_mlkem_to_msg_high
#else
adrp x3, L_mlkem_to_msg_high@PAGE
- add x3, x3, :lo12:L_mlkem_to_msg_high@PAGEOFF
+ add x3, x3, L_mlkem_to_msg_high@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x4, L_mlkem_to_msg_bits
add x4, x4, :lo12:L_mlkem_to_msg_bits
#else
adrp x4, L_mlkem_to_msg_bits@PAGE
- add x4, x4, :lo12:L_mlkem_to_msg_bits@PAGEOFF
+ add x4, x4, L_mlkem_to_msg_bits@PAGEOFF
#endif /* __APPLE__ */
ldr q0, [x2]
ldr q1, [x3]
@@ -8506,14 +8506,14 @@ _mlkem_from_msg_neon:
add x2, x2, :lo12:L_mlkem_from_msg_q1half
#else
adrp x2, L_mlkem_from_msg_q1half@PAGE
- add x2, x2, :lo12:L_mlkem_from_msg_q1half@PAGEOFF
+ add x2, x2, L_mlkem_from_msg_q1half@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x3, L_mlkem_from_msg_bits
add x3, x3, :lo12:L_mlkem_from_msg_bits
#else
adrp x3, L_mlkem_from_msg_bits@PAGE
- add x3, x3, :lo12:L_mlkem_from_msg_bits@PAGEOFF
+ add x3, x3, L_mlkem_from_msg_bits@PAGEOFF
#endif /* __APPLE__ */
ld1 {v2.16b, v3.16b}, [x1]
ldr q1, [x2]
@@ -9517,28 +9517,28 @@ _mlkem_rej_uniform_neon:
add x4, x4, :lo12:L_mlkem_rej_uniform_mask
#else
adrp x4, L_mlkem_rej_uniform_mask@PAGE
- add x4, x4, :lo12:L_mlkem_rej_uniform_mask@PAGEOFF
+ add x4, x4, L_mlkem_rej_uniform_mask@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x5, L_mlkem_aarch64_q
add x5, x5, :lo12:L_mlkem_aarch64_q
#else
adrp x5, L_mlkem_aarch64_q@PAGE
- add x5, x5, :lo12:L_mlkem_aarch64_q@PAGEOFF
+ add x5, x5, L_mlkem_aarch64_q@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x6, L_mlkem_rej_uniform_bits
add x6, x6, :lo12:L_mlkem_rej_uniform_bits
#else
adrp x6, L_mlkem_rej_uniform_bits@PAGE
- add x6, x6, :lo12:L_mlkem_rej_uniform_bits@PAGEOFF
+ add x6, x6, L_mlkem_rej_uniform_bits@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x7, L_mlkem_rej_uniform_indices
add x7, x7, :lo12:L_mlkem_rej_uniform_indices
#else
adrp x7, L_mlkem_rej_uniform_indices@PAGE
- add x7, x7, :lo12:L_mlkem_rej_uniform_indices@PAGEOFF
+ add x7, x7, L_mlkem_rej_uniform_indices@PAGEOFF
#endif /* __APPLE__ */
eor v1.16b, v1.16b, v1.16b
eor v12.16b, v12.16b, v12.16b
@@ -9754,7 +9754,7 @@ _mlkem_sha3_blocksx3_neon:
add x27, x27, :lo12:L_sha3_aarch64_r
#else
adrp x27, L_sha3_aarch64_r@PAGE
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
@@ -10079,7 +10079,7 @@ _mlkem_shake128_blocksx3_seed_neon:
add x28, x28, :lo12:L_sha3_aarch64_r
#else
adrp x28, L_sha3_aarch64_r@PAGE
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
add x0, x0, #32
@@ -10426,7 +10426,7 @@ _mlkem_shake256_blocksx3_seed_neon:
add x28, x28, :lo12:L_sha3_aarch64_r
#else
adrp x28, L_sha3_aarch64_r@PAGE
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
add x0, x0, #32
@@ -10774,7 +10774,7 @@ _mlkem_sha3_blocksx3_neon:
add x27, x27, :lo12:L_sha3_aarch64_r
#else
adrp x27, L_sha3_aarch64_r@PAGE
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
@@ -11184,7 +11184,7 @@ _mlkem_shake128_blocksx3_seed_neon:
add x28, x28, :lo12:L_sha3_aarch64_r
#else
adrp x28, L_sha3_aarch64_r@PAGE
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
add x0, x0, #32
@@ -11616,7 +11616,7 @@ _mlkem_shake256_blocksx3_seed_neon:
add x28, x28, :lo12:L_sha3_aarch64_r
#else
adrp x28, L_sha3_aarch64_r@PAGE
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
#endif /* __APPLE__ */
str x0, [x29, #40]
add x0, x0, #32
diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm.S b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
index 411349f..6089f8c 100644
--- a/wolfcrypt/src/port/arm/armv8-sha3-asm.S
+++ b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
@@ -95,7 +95,7 @@ _BlockSha3_crypto:
add x1, x1, :lo12:L_SHA3_transform_crypto_r
#else
adrp x1, L_SHA3_transform_crypto_r@PAGE
- add x1, x1, :lo12:L_SHA3_transform_crypto_r@PAGEOFF
+ add x1, x1, L_SHA3_transform_crypto_r@PAGEOFF
#endif /* __APPLE__ */
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
ld4 {v4.d, v5.d, v6.d, v7.d}[0], [x0], #32
@@ -268,7 +268,7 @@ _BlockSha3_base:
add x27, x27, :lo12:L_SHA3_transform_base_r
#else
adrp x27, L_SHA3_transform_base_r@PAGE
- add x27, x27, :lo12:L_SHA3_transform_base_r@PAGEOFF
+ add x27, x27, L_SHA3_transform_base_r@PAGEOFF
#endif /* __APPLE__ */
ldp x1, x2, [x0]
ldp x3, x4, [x0, #16]
diff --git a/wolfcrypt/src/port/arm/armv8-sha512-asm.S b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
index 514e5de..ee64e6e 100644
--- a/wolfcrypt/src/port/arm/armv8-sha512-asm.S
+++ b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
@@ -165,14 +165,14 @@ _Transform_Sha512_Len_neon:
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
#else
adrp x3, L_SHA512_transform_neon_len_k@PAGE
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
#endif /* __APPLE__ */
#ifndef __APPLE__
adrp x27, L_SHA512_transform_neon_len_r8
add x27, x27, :lo12:L_SHA512_transform_neon_len_r8
#else
adrp x27, L_SHA512_transform_neon_len_r8@PAGE
- add x27, x27, :lo12:L_SHA512_transform_neon_len_r8@PAGEOFF
+ add x27, x27, L_SHA512_transform_neon_len_r8@PAGEOFF
#endif /* __APPLE__ */
ld1 {v11.16b}, [x27]
# Load digest into working vars
@@ -1070,7 +1070,7 @@ L_sha512_len_neon_start:
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
#else
adrp x3, L_SHA512_transform_neon_len_k@PAGE
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
#endif /* __APPLE__ */
subs w2, w2, #0x80
bne L_sha512_len_neon_begin
@@ -1211,7 +1211,7 @@ _Transform_Sha512_Len_crypto:
add x4, x4, :lo12:L_SHA512_trans_crypto_len_k
#else
adrp x4, L_SHA512_trans_crypto_len_k@PAGE
- add x4, x4, :lo12:L_SHA512_trans_crypto_len_k@PAGEOFF
+ add x4, x4, L_SHA512_trans_crypto_len_k@PAGEOFF
#endif /* __APPLE__ */
# Load first 16 64-bit words of K permanently
ld1 {v8.2d, v9.2d, v10.2d, v11.2d}, [x4], #0x40
--
2.51.2
+13 -4
View File
@@ -10,16 +10,25 @@
rustPlatform.buildRustPackage {
pname = "lightway";
version = "0-unstable-2025-09-19";
version = "0-unstable-2026-01-02";
src = fetchFromGitHub {
owner = "expressvpn";
repo = "lightway";
rev = "dac72eb8af0994de020d71d24114717ecfb9804d";
hash = "sha256-oHxHJ4D/Xg/zAFiI0bMX3Dc05HXIjk+ZHuGY03cwY+c=";
rev = "8e21da7ab3a97ab75235264e85fa8615f7b0f33b";
hash = "sha256-1YpXaxPm1BMALhRU25FH5PLJ1IIRfcYA3W6e4c8Si+w=";
};
cargoHash = "sha256-RFlac10XFJXT3Giayy31kZ3Nn1Q+YsPt/zCdkSV0Atk=";
cargoHash = "sha256-4SIE/kGRd2I3sqO+IgItO1PBQHeFv9N4erfVe/9re7A=";
# Backport fix for Darwin address calculation to vendored wolfSSL 5.8.2.
# https://github.com/wolfSSL/wolfssl/pull/9537
# Drop when Lightway bumps wolfSSL past commit 5c2c459, or > 5.8.4.
postPatch = ''
patch -Np1 \
-d $cargoDepsCopy/wolfssl-sys-2.0.0/wolfssl-src \
-i ${./backport-darwin-address-calc-fix.patch}
'';
cargoBuildFlags = lib.cli.toCommandLineGNU { } {
package = [
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server";
version = "3.17.0";
version = "3.17.1";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
tag = finalAttrs.version;
hash = "sha256-jeO01VvukzpVPP/ob/p/br51uy6eVdAFqRTIo/DttR0=";
hash = "sha256-NfxBiXiGF4+meXTwp6We9+bmHW7Z9ZcxvRXAGwWAULo=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -162,11 +162,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "144.0.3719.82";
version = "144.0.3719.92";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-W7wT+1aNF7ZuhYPQ2VAvVgJ+5GWsopEnDM9FhdpxBIg=";
hash = "sha256-fi1vQIc069HS7t/pF+bC/QBbyZbpQvggUyt9pjKZUBo=";
};
# With strictDeps on, some shebangs were not being patched correctly
+2 -2
View File
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.16";
version = "2.3.0";
outputs = [
"out"
"doc"
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
hash = "sha256-HTEJp0OtiyXu+XEJsr20Zdt4N9Co0hHNOIvhtvqsPzI=";
hash = "sha256-XV68QIQ/cVbV7eMOUAFnmKxzNkZ/etNH5xZRBRbMITA=";
};
patches = [
+6
View File
@@ -51,6 +51,12 @@ stdenv.mkDerivation rec {
find . -name .libs -exec rm -rf -- {} +
'';
outputs = [
"out"
"man"
"dev"
];
meta = {
description = "NILFS utilities";
maintainers = [ lib.maintainers.raskin ];
+3 -3
View File
@@ -8,13 +8,13 @@
picom.overrideAttrs (previousAttrs: {
pname = "picom-pijulius";
version = "8.2-unstable-2025-12-09";
version = "8.2-unstable-2026-01-24";
src = fetchFromGitHub {
owner = "pijulius";
repo = "picom";
rev = "ccf24dce28ebf9e8ff805c0105b97f29bc2e66ac";
hash = "sha256-hZhqGzYjJfhnPHDc4B4xE73JtdmwsYThMu3TW0Zs24o=";
rev = "cb09df27efb4cd78417926f02338e93805067730";
hash = "sha256-/8865rKifoRk73YVul6IaDYmF2q1oFD9TCXDAIEEy5Q=";
};
dontVersionCheck = true;
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pixi";
version = "0.62.2";
version = "0.63.2";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
tag = "v${finalAttrs.version}";
hash = "sha256-HNXfcZuj+yLWatwdSOP0WDkX4y9pcVwrNjsaZdD3ZNo=";
hash = "sha256-XI7NyZhqPAgQlagCsW0GulQaHxRfgI0X/wOM19phnSA=";
};
cargoHash = "sha256-wmr1dOqV8IAhqmG4SjeCra+CEpajwZJWUlTNYVVgHVo=";
cargoHash = "sha256-Tx3XHz7/t27WB2N2QqlLzpfilRD2+dwNvC54NF0kwz8=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-28";
version = "GE-Proton10-29";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-6NvSGX8445la6WU6z9UaaKJm30eg094cuTyhHVDjbOo=";
hash = "sha256-ATtKLEKA+r557FVnBoW/iYrRR4Ki9G8rjlV4+2rki0I=";
};
dontUnpack = true;
+40 -40
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Avalonia",
"version": "11.3.8",
"hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
"version": "11.3.11",
"hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@@ -11,53 +11,53 @@
},
{
"pname": "Avalonia.BuildServices",
"version": "11.3.1",
"hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
"version": "11.3.2",
"hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
},
{
"pname": "Avalonia.Desktop",
"version": "11.3.8",
"hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
"version": "11.3.11",
"hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.3.8",
"hash": "sha256-EaUjJZ+K+5HaSJ1hmLgwuH4HGp1N2s1TNJogZulpVT8="
"version": "11.3.11",
"hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.8",
"hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
"version": "11.3.11",
"hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
},
{
"pname": "Avalonia.Native",
"version": "11.3.8",
"hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
"version": "11.3.11",
"hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.8",
"hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
"version": "11.3.11",
"hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.8",
"hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
"version": "11.3.11",
"hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.8",
"hash": "sha256-fVXc8+WPRa3YkX4EIt/Wjz9hnI7y6pv3P1cCBhEPgOg="
"version": "11.3.11",
"hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
},
{
"pname": "Avalonia.Win32",
"version": "11.3.8",
"hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
"version": "11.3.11",
"hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
},
{
"pname": "Avalonia.X11",
"version": "11.3.8",
"hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
"version": "11.3.11",
"hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
},
{
"pname": "CommunityToolkit.Mvvm",
@@ -91,33 +91,33 @@
},
{
"pname": "LTRData.DiscUtils.Core",
"version": "1.0.70",
"hash": "sha256-JkhbjVxQRipBp83zj2c5UyDHwEj/ubVi3r3GZ42onbI="
"version": "1.0.73",
"hash": "sha256-lcGzIigsoAI15hXh3bGwH05cIjZThHQbWPcCf4THgpk="
},
{
"pname": "LTRData.DiscUtils.Iso9660",
"version": "1.0.70",
"hash": "sha256-HU15n+1yxQdgxPtEXNZ9FRhX6TMa9YevrI+gkODdMco="
"version": "1.0.73",
"hash": "sha256-7YJQ1102N2DdQqJKE6V9L1NVAHsM5FFYxlYnIj+MACk="
},
{
"pname": "LTRData.DiscUtils.OpticalDisk",
"version": "1.0.70",
"hash": "sha256-lRof+dic1S/M8Llxy34NAbPkipYm9RRwNBl2oywS9KY="
"version": "1.0.73",
"hash": "sha256-FRhI9BWX2OcQvF4X9jV2wvBNcA4kV/ewXlr/m96Tjrg="
},
{
"pname": "LTRData.DiscUtils.Streams",
"version": "1.0.70",
"hash": "sha256-wM3hkrr3nv1vzgkzVw/e4m/VwMGvwzSTm8jnN/Tt4I4="
"version": "1.0.73",
"hash": "sha256-Mh+6y6MrGAepwHYFihpPWsZy77cszt1aUbmbPYNbhf0="
},
{
"pname": "LTRData.DiscUtils.Udf",
"version": "1.0.70",
"hash": "sha256-cmv6YkU/tS94w8/QZwrdJkDtxicXjhqyZ3GsdJYxjLQ="
"version": "1.0.73",
"hash": "sha256-uzH6wilWY1wTJYAe86jsudWVQ5qFI2hL+fDiDCaLslA="
},
{
"pname": "LTRData.Extensions",
"version": "1.0.20",
"hash": "sha256-K/y4fOHXQ3HbgwisjVbKmCz0lHEPilG+Icdj5choJg8="
"version": "1.0.22",
"hash": "sha256-wI3vdyeZ9teU4WaWOwfLxem7KCcVVRkWOIdg+YBdXBE="
},
{
"pname": "MicroCom.Runtime",
@@ -171,17 +171,17 @@
},
{
"pname": "System.IO.Hashing",
"version": "10.0.0",
"hash": "sha256-zq3baIIsQ1kaY4CVl0vpkDcZb2ZNwT7wC0wDqzEN5oI="
"version": "10.0.2",
"hash": "sha256-EJJnwGFb3pA25VbUqXfK/p1h07vPoxoYqz3GiaGHuP8="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.21.2",
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
"version": "0.23.0",
"hash": "sha256-YIkrazOeITsW7YDm15AvTqMKj7D2PDJtb+gqUuCdvLA="
},
{
"pname": "WmiLight",
"version": "6.16.0",
"hash": "sha256-R2L7HLEkGEWFtiLDVqXNHyszPUlLdP/jm4hX8iAmHkk="
"version": "7.1.0",
"hash": "sha256-tEMgIkptFVfMEqOce4aawypWpVveaynJC/lKJiat8nU="
}
]
+2 -2
View File
@@ -10,13 +10,13 @@
buildDotnetModule rec {
pname = "ps3-disc-dumper";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "13xforever";
repo = "ps3-disc-dumper";
tag = "v${version}";
hash = "sha256-urIeR6iVL5DDqzOUfI291WYArrEpLzNg7pnvjACUuk8=";
hash = "sha256-Bq0HZZIXWUBiD89lX3CWtlgwEhoHfVpKJh2hKdLNweY=";
};
dotnet-sdk = dotnetCorePackages.sdk_10_0;
+41
View File
@@ -0,0 +1,41 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "reactguard";
version = "0.9.9";
pyproject = true;
src = fetchFromGitHub {
owner = "theori-io";
repo = "reactguard";
tag = "v${finalAttrs.version}";
hash = "sha256-ysXdqMny6c1ATTpjI4Ev4T1yjs2jNu4mf7azO/IsAKI=";
};
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
httpx
typing-extensions
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
pytest-cov-stub
pytest-xdist
];
pythonImportsCheck = [ "reactguard" ];
meta = {
description = "Vulnerability detection tool for CVE-2025-55182 (React2Shell";
homepage = "https://github.com/theori-io/reactguard";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "reactguard";
};
})
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.22.58";
version = "1.22.67";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-xGA3ASWRuM+RloOHcaNregTClf+XUtP7jrTiQRem71s=";
hash = "sha256-HKY8ockflFnws8UoREFjaBQUPaVPxlH2fWFcaGTdwhI=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
+1
View File
@@ -31,6 +31,7 @@ python.pkgs.toPythonModule (
"flask-babel"
"httpx-socks"
"lxml"
"markdown-it-py"
"msgspec"
"typer-slim"
"whitenoise"
+2 -2
View File
@@ -13,13 +13,13 @@
}:
let
version = "1.0.1291";
version = "1.0.1297";
src = fetchFromGitHub {
owner = "lollipopkit";
repo = "flutter_server_box";
tag = "v${version}";
hash = "sha256-5SEw0hNeZg2a4SaqFnkKASeEVXpLWVjQVNT2NlaJz9c=";
hash = "sha256-5E+tvI/YIos5pyO7OfIfzunyiuhgDY9561sV+85hvtg=";
};
in
flutter338.buildFlutterApplication {
+12 -12
View File
@@ -254,11 +254,11 @@
"dependency": "transitive",
"description": {
"name": "camera_web",
"sha256": "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f",
"sha256": "57f49a635c8bf249d07fb95eb693d7e4dda6796dedb3777f9127fb54847beba7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.5"
"version": "0.3.5+3"
},
"characters": {
"dependency": "transitive",
@@ -547,11 +547,11 @@
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
"sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.1.5"
},
"file": {
"dependency": "transitive",
@@ -904,21 +904,21 @@
"dependency": "transitive",
"description": {
"name": "hive_ce",
"sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230",
"sha256": "29f8791bf13fa6cf7435a58f1f82a7c9706973c867affa77c34d91e105762664",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.15.1"
"version": "2.17.0"
},
"hive_ce_flutter": {
"dependency": "direct main",
"description": {
"name": "hive_ce_flutter",
"sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
"sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.3.4"
},
"hive_ce_generator": {
"dependency": "direct dev",
@@ -1034,11 +1034,11 @@
"dependency": "transitive",
"description": {
"name": "isolate_channel",
"sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
"sha256": "68191008e3a219bc87cc8cddbcd1e29810bd9f3a0fdc2108b574ccbd9aafda08",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.2+1"
"version": "0.3.0"
},
"isolate_contactor": {
"dependency": "transitive",
@@ -2182,11 +2182,11 @@
"dependency": "transitive",
"description": {
"name": "watcher",
"sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
"sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.4"
"version": "1.2.1"
},
"web": {
"dependency": "transitive",
+2 -2
View File
@@ -28,7 +28,7 @@
c-ares,
}:
let
version = "2024.1.3";
version = "2024.1.4";
in
stdenv.mkDerivation rec {
pname = "simgear";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "flightgear";
repo = "simgear";
tag = version;
hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4=";
hash = "sha256-WJI15egN1H+EAIaFuI3svYCvM0xzsIGcIPsZgLsvBc0=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sydbox";
version = "3.48.4";
version = "3.48.5";
outputs = [
"out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "Sydbox";
repo = "sydbox";
tag = "v${finalAttrs.version}";
hash = "sha256-rDJrmwBq2OSCqBOTtN2FncGwBzAafLUbjkgmfDVPYag=";
hash = "sha256-G2vp1hSY29D+50vMQWsiAznwiLe/Gs9zRRBOkCPfOlw=";
};
cargoHash = "sha256-fq7XksglWJJzHBbnILVWn76xMUdR+pwc0W4S1P0SuNQ=";
cargoHash = "sha256-9GpmO5AqijlaLVRQAM+9r+caDGJYfzsG1zzYLlK8n1o=";
nativeBuildInputs = [
mandoc
+8 -6
View File
@@ -4,18 +4,19 @@
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tcping-rs";
version = "1.2.21";
version = "1.2.24";
src = fetchFromGitHub {
owner = "lvillis";
repo = "tcping-rs";
tag = version;
hash = "sha256-n8eYxq3zFj1337lC7OJ32p9AaMU4HJDWVk0Bkw/STJ0=";
tag = finalAttrs.version;
hash = "sha256-gsTZls5guqtDk8x+3q4nFYGwhr+TAV5iE9kiZgbmzCI=";
};
cargoHash = "sha256-l1VzdBuwNANT9rUEEPuESfOp7/f3tghJrX/SEY9fSeA=";
cargoHash = "sha256-m/juo6+SPFAxQ7E2JgTkv47kxn4LhwfI4UGSDzHAXMc=";
checkFlags = [
# This test requires external network access
@@ -27,8 +28,9 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "TCP Ping (tcping) Utility for Port Reachability";
homepage = "https://github.com/lvillis/tcping-rs";
changelog = "https://github.com/lvillis/tcping-rs/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
mainProgram = "tcping";
maintainers = with lib.maintainers; [ heitorPB ];
};
}
})
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "vacuum-tube";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "shy1132";
repo = "VacuumTube";
tag = "v${version}";
hash = "sha256-b5OnDoMejnupeK4sWoXQo7vpFFD/y1p4vxMZTMMO25g=";
hash = "sha256-rFR82BO5rXv+4ePx5FqXOWec7ncM5Ml0dwixtLXQFts=";
};
npmDepsHash = "sha256-NBsLgcYFHnj+hVELTKMreLsrJAu3S+RuhBcOTeIhQew=";
npmDepsHash = "sha256-u5cfKgKP+n7V8gk2NRWNJz/P7hxURnPFQ7yjLE+fAlE=";
makeCacheWritable = true;
env = {
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaTraces";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaTraces";
tag = "v${finalAttrs.version}";
hash = "sha256-MWPw2SJlqjQCyBYT++A0KcwccdpTP7Ome4RfA7lcjAM=";
hash = "sha256-Hli0JNQ0XpLXI10ol5fdmhk35/SFSo1o/SiVmYVWlCs=";
};
vendorHash = null;
+3 -3
View File
@@ -13,20 +13,20 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wasmtime";
version = "40.0.2";
version = "41.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasmtime";
tag = "v${finalAttrs.version}";
hash = "sha256-4y9WpCdyuF/Tp2k/1d5rZxwYunWNdeibEsFgHcBC52Q=";
hash = "sha256-/NQ1nmF5u/mNhS5orvohUWjSrp6YYtzJqpJV2iwn63Q=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-aTPgnuBvOIqg1+Sa2ZLdMTLujm8dKGK5xpZ3qHpr3f8=";
cargoHash = "sha256-OViDhQVAs11PzuS4OGL0dzn+K9+yqHwTzXynxl95y88=";
cargoBuildFlags = [
"--package"
"wasmtime-cli"
@@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "2.20.1-unstable-2025-11-20";
version = "2.21.0-unstable-2026-01-25";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -18,10 +18,10 @@
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.7.1.1-unstable-2025-11-20";
version = "1.7.1.1-unstable-2026-01-25";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
@@ -17,10 +17,10 @@
}:
mkDerivation {
pname = "hackage-db";
version = "2.1.3-unstable-2025-11-20";
version = "2.1.3-unstable-2026-01-25";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -14,10 +14,10 @@
}:
mkDerivation {
pname = "language-nix";
version = "2.3.0-unstable-2025-11-20";
version = "2.3.0-unstable-2026-01-25";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
+182 -182
View File
@@ -14091,7 +14091,7 @@ self: {
directory,
filepath,
JuicyPixels,
libX11,
libx11,
mwc-random,
primitive,
random,
@@ -14113,12 +14113,12 @@ self: {
random
vector
];
executableSystemDepends = [ libX11 ];
executableSystemDepends = [ libx11 ];
description = "Generates colorful wallpapers";
license = lib.licenses.mit;
mainProgram = "FractalArt";
}
) { inherit (pkgs.xorg) libX11; };
) { inherit (pkgs) libx11; };
Fractaler = callPackage (
{
@@ -14737,9 +14737,9 @@ self: {
mkDerivation,
base,
libGL,
libX11,
libXext,
libXfixes,
libx11,
libxext,
libxfixes,
OpenGL,
}:
mkDerivation {
@@ -14754,9 +14754,9 @@ self: {
];
librarySystemDepends = [
libGL
libX11
libXext
libXfixes
libx11
libxext
libxfixes
];
description = "A Haskell binding for GLFW";
license = lib.licenses.bsd3;
@@ -14766,9 +14766,9 @@ self: {
)
{
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXfixes;
inherit (pkgs) libx11;
inherit (pkgs) libxext;
inherit (pkgs) libxfixes;
};
GLFW-OGL =
@@ -14777,8 +14777,8 @@ self: {
{
mkDerivation,
base,
libX11,
libXrandr,
libx11,
libxrandr,
mtl,
OGL,
}:
@@ -14793,8 +14793,8 @@ self: {
OGL
];
librarySystemDepends = [
libX11
libXrandr
libx11
libxrandr
];
description = "A binding for GLFW (OGL)";
license = lib.licenses.bsd3;
@@ -14802,8 +14802,8 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs) libx11;
inherit (pkgs) libxrandr;
};
GLFW-b = callPackage (
@@ -14908,7 +14908,7 @@ self: {
mkDerivation,
base,
libGL,
libX11,
libx11,
}:
mkDerivation {
pname = "GLHUI";
@@ -14917,7 +14917,7 @@ self: {
libraryHaskellDepends = [ base ];
librarySystemDepends = [
libGL
libX11
libx11
];
description = "Open OpenGL context windows in X11 with libX11";
license = lib.licenses.bsd3;
@@ -14926,7 +14926,7 @@ self: {
)
{
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs) libx11;
};
GLM = callPackage (
@@ -18474,7 +18474,7 @@ self: {
bytestring,
hg3dsdl2050,
HGamer3D-Data,
libX11,
libx11,
SDL2,
utf8-string,
}:
@@ -18490,7 +18490,7 @@ self: {
];
librarySystemDepends = [
hg3dsdl2050
libX11
libx11
SDL2
];
description = "SDL2 Binding for HGamer3D";
@@ -18501,7 +18501,7 @@ self: {
{
inherit (pkgs) SDL2;
hg3dsdl2050 = null;
inherit (pkgs.xorg) libX11;
inherit (pkgs) libx11;
};
HGamer3D-SFML-Binding =
@@ -47788,12 +47788,12 @@ self: {
mkDerivation,
base,
data-default-class,
libX11,
libXext,
libXinerama,
libXrandr,
libXrender,
libXScrnSaver,
libx11,
libxext,
libxinerama,
libxrandr,
libxrender,
libxscrnsaver,
}:
mkDerivation {
pname = "X11";
@@ -47806,12 +47806,12 @@ self: {
data-default-class
];
librarySystemDepends = [
libX11
libXext
libXinerama
libXrandr
libXrender
libXScrnSaver
libx11
libxext
libxinerama
libxrandr
libxrender
libxscrnsaver
];
description = "A binding to the X11 graphics library";
license = lib.licenses.bsd3;
@@ -47819,19 +47819,19 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXScrnSaver;
inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender;
inherit (pkgs) libx11;
inherit (pkgs) libxext;
inherit (pkgs) libxinerama;
inherit (pkgs) libxrandr;
inherit (pkgs) libxrender;
inherit (pkgs) libxscrnsaver;
};
X11-extras = callPackage (
{
mkDerivation,
base,
libX11,
libx11,
X11,
}:
mkDerivation {
@@ -47844,13 +47844,13 @@ self: {
base
X11
];
librarySystemDepends = [ libX11 ];
librarySystemDepends = [ libx11 ];
description = "Missing bindings to the X11 graphics library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}
) { inherit (pkgs.xorg) libX11; };
) { inherit (pkgs) libx11; };
X11-rm = callPackage (
{
@@ -47923,7 +47923,7 @@ self: {
{
mkDerivation,
base,
libXft,
libxft,
utf8-string,
X11,
}:
@@ -47936,12 +47936,12 @@ self: {
utf8-string
X11
];
libraryPkgconfigDepends = [ libXft ];
libraryPkgconfigDepends = [ libxft ];
description = "Bindings to the Xft and some Xrender parts";
license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.slotThe ];
}
) { inherit (pkgs.xorg) libXft; };
) { inherit (pkgs) libxft; };
X11-xshape = callPackage (
{
@@ -48001,7 +48001,7 @@ self: {
license = lib.licenses.bsd3;
platforms = lib.platforms.windows;
}
) { inherit (pkgs.xorg) xinput; };
) { inherit (pkgs) xinput; };
XML = callPackage (
{
@@ -48212,18 +48212,18 @@ self: {
{
mkDerivation,
base,
libXau,
libxau,
}:
mkDerivation {
pname = "Xauth";
version = "0.1";
sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ libXau ];
libraryPkgconfigDepends = [ libxau ];
description = "A binding to the X11 authentication library";
license = lib.licenses.bsd3;
}
) { inherit (pkgs.xorg) libXau; };
) { inherit (pkgs) libxau; };
Xec = callPackage (
{
@@ -105264,14 +105264,14 @@ self: {
bindings-DSL,
HUnit,
libGL,
libX11,
libXcursor,
libXext,
libXfixes,
libXi,
libXinerama,
libXrandr,
libXxf86vm,
libx11,
libxcursor,
libxext,
libxfixes,
libxi,
libxinerama,
libxrandr,
libxxf86vm,
test-framework,
test-framework-hunit,
}:
@@ -105285,14 +105285,14 @@ self: {
];
librarySystemDepends = [
libGL
libX11
libXcursor
libXext
libXfixes
libXi
libXinerama
libXrandr
libXxf86vm
libx11
libxcursor
libxext
libxfixes
libxi
libxinerama
libxrandr
libxxf86vm
];
testHaskellDepends = [
base
@@ -105306,14 +105306,14 @@ self: {
)
{
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXcursor;
inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXfixes;
inherit (pkgs.xorg) libXi;
inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXxf86vm;
inherit (pkgs) libx11;
inherit (pkgs) libxcursor;
inherit (pkgs) libxext;
inherit (pkgs) libxfixes;
inherit (pkgs) libxi;
inherit (pkgs) libxinerama;
inherit (pkgs) libxrandr;
inherit (pkgs) libxxf86vm;
};
bindings-K8055 = callPackage (
@@ -112798,8 +112798,8 @@ self: {
filepath,
finite-typelits,
hspec,
libX11,
libXrandr,
libx11,
libxrandr,
lifted-base,
monad-control,
mtl,
@@ -112838,8 +112838,8 @@ self: {
X11
];
librarySystemDepends = [
libX11
libXrandr
libx11
libxrandr
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -112857,8 +112857,8 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs) libx11;
inherit (pkgs) libxrandr;
};
bludigon =
@@ -112874,8 +112874,8 @@ self: {
filepath,
finite-typelits,
hspec,
libX11,
libXrandr,
libx11,
libxrandr,
lifted-base,
monad-control,
mtl,
@@ -112914,8 +112914,8 @@ self: {
X11
];
librarySystemDepends = [
libX11
libXrandr
libx11
libxrandr
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -112935,8 +112935,8 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs) libx11;
inherit (pkgs) libxrandr;
};
bluefin = callPackage (
@@ -229157,7 +229157,7 @@ self: {
mkDerivation,
base,
base-prelude,
libXtst,
libxtst,
split,
X11,
}:
@@ -229171,13 +229171,13 @@ self: {
split
X11
];
librarySystemDepends = [ libXtst ];
librarySystemDepends = [ libxtst ];
description = "A crossplatform library to simulate keyboard input";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}
) { inherit (pkgs.xorg) libXtst; };
) { inherit (pkgs) libxtst; };
fakedata = callPackage (
{
@@ -249257,8 +249257,8 @@ self: {
bytestring,
containers,
directory,
libX11,
libXext,
libx11,
libxext,
old-time,
parallel,
process,
@@ -249284,8 +249284,8 @@ self: {
unix
];
librarySystemDepends = [
libX11
libXext
libx11
libxext
];
executableHaskellDepends = [
array
@@ -249301,8 +249301,8 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXext;
inherit (pkgs) libx11;
inherit (pkgs) libxext;
};
fugue = callPackage (
@@ -270088,7 +270088,7 @@ self: {
haskell-gi,
haskell-gi-base,
haskell-gi-overloading,
libX11,
libx11,
text,
transformers,
}:
@@ -270111,11 +270111,11 @@ self: {
text
transformers
];
libraryPkgconfigDepends = [ libX11 ];
libraryPkgconfigDepends = [ libx11 ];
description = "xlib bindings";
license = lib.licenses.lgpl21Only;
}
) { inherit (pkgs.xorg) libX11; };
) { inherit (pkgs) libx11; };
giak = callPackage (
{
@@ -286017,9 +286017,9 @@ self: {
directory,
exceptions,
hashable,
libX11,
libXau,
libXScrnSaver,
libx11,
libxau,
libxscrnsaver,
microlens,
microlens-mtl,
protolude,
@@ -286058,9 +286058,9 @@ self: {
X11
];
executablePkgconfigDepends = [
libX11
libXau
libXScrnSaver
libx11
libxau
libxscrnsaver
xcb
xdmcp
];
@@ -286070,9 +286070,9 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXScrnSaver;
inherit (pkgs.xorg) libXau;
inherit (pkgs) libx11;
inherit (pkgs) libxau;
inherit (pkgs) libxscrnsaver;
xcb = null;
xdmcp = null;
};
@@ -289142,7 +289142,7 @@ self: {
base,
glib,
gtk3,
libX11,
libx11,
}:
mkDerivation {
pname = "gtk-traymanager";
@@ -289153,11 +289153,11 @@ self: {
glib
gtk3
];
libraryPkgconfigDepends = [ libX11 ];
libraryPkgconfigDepends = [ libx11 ];
description = "A wrapper around the eggtraymanager library for Linux system trays";
license = lib.licenses.lgpl21Only;
}
) { inherit (pkgs.xorg) libX11; };
) { inherit (pkgs) libx11; };
gtk2hs-buildtools = callPackage (
{
@@ -289572,10 +289572,10 @@ self: {
gtk2hs-buildtools,
gtkglext,
libGLU,
libICE,
libSM,
libXmu,
libXt,
libice,
libsm,
libxmu,
libxt,
pango,
}:
mkDerivation {
@@ -289597,10 +289597,10 @@ self: {
librarySystemDepends = [
gtk2
libGLU
libICE
libSM
libXmu
libXt
libice
libsm
libxmu
libxt
];
libraryPkgconfigDepends = [ gtkglext ];
libraryToolDepends = [ gtk2hs-buildtools ];
@@ -289614,10 +289614,10 @@ self: {
inherit (pkgs) gtk2;
inherit (pkgs.gnome2) gtkglext;
inherit (pkgs) libGLU;
inherit (pkgs.xorg) libICE;
inherit (pkgs.xorg) libSM;
inherit (pkgs.xorg) libXmu;
inherit (pkgs.xorg) libXt;
inherit (pkgs) libice;
inherit (pkgs) libsm;
inherit (pkgs) libxmu;
inherit (pkgs) libxt;
};
gtkimageview = callPackage (
@@ -290394,12 +290394,12 @@ self: {
containers,
lens,
libGL,
libX11,
libXcursor,
libXext,
libXi,
libXinerama,
libXrandr,
libx11,
libxcursor,
libxext,
libxi,
libxinerama,
libxrandr,
linear,
template-haskell,
text,
@@ -290425,12 +290425,12 @@ self: {
librarySystemDepends = [
c
libGL
libX11
libXcursor
libXext
libXi
libXinerama
libXrandr
libx11
libxcursor
libxext
libxi
libxinerama
libxrandr
];
description = "Raylib bindings for Haskell";
license = lib.licensesSpdx."Apache-2.0";
@@ -290440,12 +290440,12 @@ self: {
{
c = null;
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXcursor;
inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXi;
inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs) libx11;
inherit (pkgs) libxcursor;
inherit (pkgs) libxext;
inherit (pkgs) libxi;
inherit (pkgs) libxinerama;
inherit (pkgs) libxrandr;
};
h-reversi = callPackage (
@@ -342135,8 +342135,8 @@ self: {
hoodle-types,
http-types,
lens,
libX11,
libXi,
libx11,
libxi,
monad-loops,
mtl,
network-uri,
@@ -342214,8 +342214,8 @@ self: {
xournal-parser
];
librarySystemDepends = [
libX11
libXi
libx11
libxi
];
description = "Core library for hoodle";
license = lib.licenses.bsd3;
@@ -342223,8 +342223,8 @@ self: {
}
)
{
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXi;
inherit (pkgs) libx11;
inherit (pkgs) libxi;
};
hoodle-extra = callPackage (
@@ -475538,7 +475538,7 @@ self: {
inline-c,
libGL,
libGLU,
libX11,
libx11,
QuickCheck,
text,
vector,
@@ -475562,7 +475562,7 @@ self: {
glew
libGL
libGLU
libX11
libx11
];
libraryPkgconfigDepends = [
freetype
@@ -475587,7 +475587,7 @@ self: {
inherit (pkgs) glew;
inherit (pkgs) libGL;
inherit (pkgs) libGLU;
inherit (pkgs.xorg) libX11;
inherit (pkgs) libx11;
};
nanovg-simple = callPackage (
@@ -491837,8 +491837,8 @@ self: {
base,
either,
libGL,
libX11,
libXinerama,
libx11,
libxinerama,
monads-tf,
ovr,
systemd,
@@ -491858,8 +491858,8 @@ self: {
];
librarySystemDepends = [
libGL
libX11
libXinerama
libx11
libxinerama
ovr
systemd
];
@@ -491871,8 +491871,8 @@ self: {
)
{
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXinerama;
inherit (pkgs) libx11;
inherit (pkgs) libxinerama;
ovr = null;
inherit (pkgs) systemd;
};
@@ -528022,7 +528022,7 @@ self: {
mkDerivation,
base,
base-unicode-symbols,
libXinerama,
libxinerama,
X11,
}:
mkDerivation {
@@ -528036,12 +528036,12 @@ self: {
base-unicode-symbols
X11
];
executableSystemDepends = [ libXinerama ];
executableSystemDepends = [ libxinerama ];
description = "A utility for X11 that moves the mouse cursor using the keyboard";
license = lib.licenses.gpl3Only;
mainProgram = "place-cursor-at";
}
) { inherit (pkgs.xorg) libXinerama; };
) { inherit (pkgs) libxinerama; };
placeholder = callPackage (
{
@@ -620388,7 +620388,7 @@ self: {
base,
bytestring,
containers,
libXft,
libxft,
mtl,
parsec,
permute,
@@ -620431,7 +620431,7 @@ self: {
X11-xshape
];
libraryPkgconfigDepends = [
libXft
libxft
xext
];
executableHaskellDepends = [
@@ -620455,7 +620455,7 @@ self: {
X11-xshape
];
executablePkgconfigDepends = [
libXft
libxft
xext
];
description = "A programming language for simple GUIs";
@@ -620466,7 +620466,7 @@ self: {
}
)
{
inherit (pkgs.xorg) libXft;
inherit (pkgs) libxft;
xext = null;
};
@@ -742896,7 +742896,7 @@ self: {
directory,
filepath,
libGL,
libX11,
libx11,
process,
split,
wxdirect,
@@ -742924,7 +742924,7 @@ self: {
];
librarySystemDepends = [
libGL
libX11
libx11
];
libraryPkgconfigDepends = [ wxGTK ];
doHaddock = false;
@@ -742937,7 +742937,7 @@ self: {
)
{
inherit (pkgs) libGL;
inherit (pkgs.xorg) libX11;
inherit (pkgs) libx11;
inherit (pkgs) wxGTK;
};
@@ -743274,7 +743274,7 @@ self: {
base,
c2hs,
containers,
libXi,
libxi,
mtl,
X11,
}:
@@ -743288,12 +743288,12 @@ self: {
mtl
X11
];
librarySystemDepends = [ libXi ];
librarySystemDepends = [ libxi ];
libraryToolDepends = [ c2hs ];
description = "Haskell FFI bindings for X11 XInput library (-lXi)";
license = lib.licenses.bsd3;
}
) { inherit (pkgs.xorg) libXi; };
) { inherit (pkgs) libxi; };
x509 = callPackage (
{
@@ -747236,9 +747236,9 @@ self: {
http-types,
iwlib,
libmpd,
libXpm,
libXrandr,
libXrender,
libxpm,
libxrandr,
libxrender,
mtl,
old-locale,
pango,
@@ -747320,9 +747320,9 @@ self: {
X11-xft
];
librarySystemDepends = [
libXpm
libXrandr
libXrender
libxpm
libxrandr
libxrender
wirelesstools
];
executableHaskellDepends = [
@@ -747371,9 +747371,9 @@ self: {
}
)
{
inherit (pkgs.xorg) libXpm;
inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender;
inherit (pkgs) libxpm;
inherit (pkgs) libxrandr;
inherit (pkgs) libxrender;
inherit (pkgs) wirelesstools;
};
@@ -748835,7 +748835,7 @@ self: {
{
mkDerivation,
base,
libXtst,
libxtst,
X11,
}:
mkDerivation {
@@ -748846,11 +748846,11 @@ self: {
base
X11
];
librarySystemDepends = [ libXtst ];
librarySystemDepends = [ libxtst ];
description = "Thin FFI bindings to X11 XTest library";
license = lib.licenses.bsd3;
}
) { inherit (pkgs.xorg) libXtst; };
) { inherit (pkgs) libxtst; };
xturtle = callPackage (
{
+6 -1
View File
@@ -1144,6 +1144,8 @@ in
++ [
lua.pkgs.luarocks-build-treesitter-parser-cpp
];
meta.broken = lua.luaversion != "5.1";
});
tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: {
@@ -1157,11 +1159,14 @@ in
old.propagatedBuildInputs
++ [
lua.pkgs.luarocks-build-treesitter-parser
tree-sitter
];
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
writableTmpDirAsHomeHook
tree-sitter
];
# should be fixed upstream
meta.broken = lua.luaversion != "5.1";
});
vstruct = prev.vstruct.overrideAttrs (_: {
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "agentic-threat-hunting-framework";
version = "0.4.0";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Nebulock-Inc";
repo = "agentic-threat-hunting-framework";
tag = "v${finalAttrs.version}";
hash = "sha256-WU58wQGlUgbOqcIE7EKtABNvTKtvTiRO9iJLW4gXDlI=";
hash = "sha256-0IlDOS9qWl0F9h3xWDioK/GhZ3HanAQMdAkH6mvvQCQ=";
};
build-system = [ setuptools ];
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "aiontfy";
version = "0.6.1";
version = "0.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "tr4nt0r";
repo = "aiontfy";
tag = "v${version}";
hash = "sha256-43sl9jCJErROEOIllUFizG6IIBpFWCQTRyJP+0u1z+M=";
hash = "sha256-tQjS9GXCiDOL3O8l1NotTk6LNvDgCa+tz0re96myu2w=";
};
build-system = [
@@ -10,21 +10,26 @@ let
format = "wheel";
pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
platforms = rec {
aarch64-darwin = "macosx_10_13_universal2";
aarch64-darwin =
if pyShortVersion == "cp314" then "macosx_10_15_universal2" else "macosx_10_13_universal2";
aarch64-linux = "manylinux_2_26_aarch64";
x86_64-darwin = aarch64-darwin;
x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64";
};
platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
hashes = rec {
cp312-aarch64-darwin = "sha256-qbdDlsAHHrRDijyLgYZMVKjoqxBPEFhNf+ZHQ0Qo+08=";
cp312-aarch64-linux = "sha256-1cfo6K3h1l6hzbHNIK2H0Y9uejjyFWAYlczUSvyTLOE=";
cp312-aarch64-darwin = "sha256-hQ9VN5Wl8RQ53ShE5q/LqzgNsZHX27W7b05rGeH95jc=";
cp312-aarch64-linux = "sha256-wKQjIAmhM+Smk3XzzlR8ZtwxJpr8hvbV15QTfSMxuE8=";
cp312-x86_64-darwin = cp312-aarch64-darwin;
cp312-x86_64-linux = "sha256-nXcNqkw/Chn+tmcRa1GaQSjTgn3wdnaUbskLOyOSEpo=";
cp313-aarch64-darwin = "sha256-9anXslqv9KIxf/Dt7xCAqF6/tQFDlWwOMkQookmXDBE=";
cp313-aarch64-linux = "sha256-0x5gOK+m0LygVFuh6hGfNyaWXclNdfuBppqq7Pu3FoI=";
cp312-x86_64-linux = "sha256-yISDKQFJYKZAxXE2vyrcanXcc3FvUHKcpshtaLnwtrI=";
cp313-aarch64-darwin = "sha256-j8E8zsPr1m4q7p1i4ihUuzPSczbRKuZGWp0C/oNx0Lc=";
cp313-aarch64-linux = "sha256-QvHfssbnKwoBmcqqBbOP2wLclJ7xol6054n8XqUtk44=";
cp313-x86_64-darwin = cp313-aarch64-darwin;
cp313-x86_64-linux = "sha256-rSAMw5aAp+Emz2Xlo2GXrbVsvKRw/CcxcF441N/IsTw=";
cp313-x86_64-linux = "sha256-wVm6yMfrL0rMgVebo/WGAyb7LKOp139g8U0GhgCbRoc=";
cp314-aarch64-darwin = "sha256-QCytKZtPSzdGDKg0LjFbJS/y5whqa8mcotNfecYXPVw=";
cp314-aarch64-linux = "sha256-qHAOVJwmZ6ojUDSmFJrxaiE4unwfns0VtVdUcEq2zq8=";
cp314-x86_64-darwin = cp314-aarch64-darwin;
cp314-x86_64-linux = "sha256-WUSCCjJ4uWTwxIsasIOizEmZ9HuZBoWVV0F3wPiXOCY=";
};
hash =
hashes."${pyShortVersion}-${stdenv.system}"
@@ -32,7 +37,7 @@ let
in
buildPythonPackage rec {
pname = "gurobipy";
version = "13.0.0";
version = "13.0.1";
inherit format;
src = fetchPypi {
@@ -14,16 +14,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "gwcs";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "spacetelescope";
repo = "gwcs";
tag = version;
hash = "sha256-aiC+uJ5S2HggBsou4vbjxxNtilRVC4eklRgML/lLK+4=";
tag = finalAttrs.version;
hash = "sha256-0iUnapBn8yDCx1tqHD10Ljid15yBuqlICyFuva2LNPk=";
};
build-system = [
@@ -50,8 +50,8 @@ buildPythonPackage rec {
meta = {
description = "Module to manage the Generalized World Coordinate System";
homepage = "https://github.com/spacetelescope/gwcs";
changelog = "https://github.com/spacetelescope/gwcs/blob/${src.tag}/CHANGES.rst";
changelog = "https://github.com/spacetelescope/gwcs/blob/${finalAttrs.src.tag}/CHANGES.rst";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -10,12 +10,12 @@
buildPythonPackage (finalAttrs: {
pname = "hcloud";
version = "2.15.0";
version = "2.16.0";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-/Y5mjersmXo/6t5e3Te+BZpT5MvBT7AGCXZnUC737U0=";
hash = "sha256-6xrLMRW8CzVrRQrSMlaHO1gxGzV6SWJaj+DLq6LbUJs=";
};
build-system = [ setuptools ];
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202601241";
version = "0.1.202601251";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-LItzSttudJs1VmcXabxD38omsuK8+RsFMDYCPmm/+Ok=";
hash = "sha256-X0hS2sAvFCEpCKCDEXUzlYPSz0/E6n7H66ytIP+EgrI=";
};
__darwinAllowLocalNetworking = true;
@@ -38,6 +38,10 @@ buildPythonPackage rec {
fixDarwinDylibNames
];
# Ensure that there is enough space for the `fixDarwinDylibNames` hook to
# update the install names of the output dylibs.
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
pythonImportsCheck = [ "klayout" ];
meta = {
@@ -7,15 +7,15 @@
hatchling,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "llama-index-embeddings-gemini";
version = "0.4.1";
version = "0.4.2";
pyproject = true;
src = fetchPypi {
pname = "llama_index_embeddings_gemini";
inherit version;
hash = "sha256-XkFXYdaRr1i0Ez5GLkxIGIJZcR/hCS2mB2t5jWRUUs0=";
inherit (finalAttrs) version;
hash = "sha256-GY983cmRtwir+2q0qyJW5iFmK+96ed5lu6pKHcUm/4g=";
};
pythonRelaxDeps = [ "google-generativeai" ];
@@ -38,4 +38,4 @@ buildPythonPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -0,0 +1,62 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
uv-build,
# dependencies
mdformat,
mdit-py-plugins,
ruamel-yaml,
toml,
# tests
pytestCheckHook,
typing-extensions,
}:
buildPythonPackage (finalAttrs: {
pname = "mdformat-front-matters";
version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "kyleking";
repo = "mdformat-front-matters";
tag = "v${finalAttrs.version}";
hash = "sha256-nfthUgOmKI57d+xLMmzveYPugzvvwkIzA//+CgvJGRw=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "uv_build>=0.9.10" "uv_build"
'';
build-system = [
uv-build
];
dependencies = [
mdformat
mdit-py-plugins
ruamel-yaml
toml
];
pythonImportsCheck = [ "mdformat_front_matters" ];
nativeCheckInputs = [
pytestCheckHook
typing-extensions
];
meta = {
description = "mdformat plugin to format YAML, TOML, or JSON front matter";
homepage = "https://github.com/kyleking/mdformat-front-matters";
changelog = "https://github.com/KyleKing/mdformat-front-matters/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
})
@@ -2,27 +2,34 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
flit-core,
# dependencies
mdformat,
mdit-py-plugins,
ruamel-yaml,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-frontmatter";
version = "2.0.8";
version = "2.0.10";
pyproject = true;
src = fetchFromGitHub {
owner = "butler54";
repo = "mdformat-frontmatter";
tag = "v${version}";
hash = "sha256-2heQw8LL/ILY36oItBeQq33qjVBGT51qGG4CcCEDutA=";
tag = "v${finalAttrs.version}";
hash = "sha256-snW9L9vnRHjNchhWZ5sIrn1r4piEYJeKQwib/4rarOo=";
};
nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];
propagatedBuildInputs = [
dependencies = [
mdformat
mdit-py-plugins
ruamel-yaml
@@ -30,14 +37,18 @@ buildPythonPackage rec {
pythonImportsCheck = [ "mdformat_frontmatter" ];
nativeCheckInputs = [
pytestCheckHook
];
meta = {
description = "Mdformat plugin to ensure frontmatter is respected";
homepage = "https://github.com/butler54/mdformat-frontmatter";
changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/butler54/mdformat-frontmatter/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
aldoborrero
polarmutex
];
};
}
})
@@ -2,53 +2,55 @@
lib,
buildPythonPackage,
fetchFromGitHub,
linkify-it-py,
# build-system
flit-core,
# dependencies
markdown-it-py,
mdformat,
mdformat-tables,
mdit-py-plugins,
poetry-core,
wcwidth,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-gfm";
version = "0.3.6";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "hukkin";
repo = "mdformat-gfm";
tag = version;
hash = "sha256-c1jJwyTL8IgQnIAJFoPSuJ8VEYgnQ4slZyV0bHlUHLQ=";
tag = finalAttrs.version;
hash = "sha256-Vijt5P3KRL4jkU8AI2lAsJkvFne/l3utUkjHUs8PQHI=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [
flit-core
];
propagatedBuildInputs = [
dependencies = [
markdown-it-py
mdformat
mdformat-tables
mdit-py-plugins
linkify-it-py
wcwidth
];
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
"test_default_style__api"
"test_default_style__cli"
];
pythonImportsCheck = [ "mdformat_gfm" ];
meta = {
description = "Mdformat plugin for GitHub Flavored Markdown compatibility";
homepage = "https://github.com/hukkin/mdformat-gfm";
changelog = "https://github.com/hukkin/mdformat-gfm/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
aldoborrero
polarmutex
];
};
}
})
@@ -2,13 +2,15 @@
lib,
buildPythonPackage,
fetchFromGitHub,
flit-core,
# build-system
uv-build,
mdformat-beautysh,
mdformat-footnote,
mdformat-frontmatter,
mdformat-front-matters,
mdformat-gfm,
mdformat-simple-breaks,
mdformat-tables,
mdformat,
mdit-py-plugins,
more-itertools,
@@ -16,19 +18,26 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-mkdocs";
version = "4.4.2";
version = "5.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "KyleKing";
repo = "mdformat-mkdocs";
tag = "v${version}";
hash = "sha256-u3IHqllknX6ilReXRVyZoDfqid8Ioe+zvC3wPh04HXo=";
tag = "v${finalAttrs.version}";
hash = "sha256-PklT9LlaIQFG194zhHQhzR8kVe084Q+1Bo9180eOMd0=";
};
build-system = [ flit-core ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "uv_build>=0.9.10" "uv_build"
'';
build-system = [
uv-build
];
dependencies = [
mdformat
@@ -42,10 +51,9 @@ buildPythonPackage rec {
mdformat-beautysh
# mdformat-config
mdformat-footnote
mdformat-frontmatter
mdformat-front-matters
# mdformat-ruff
mdformat-simple-breaks
mdformat-tables
# mdformat-web
# mdformat-wikilink
];
@@ -66,8 +74,8 @@ buildPythonPackage rec {
meta = {
description = "Mdformat plugin for MkDocs";
homepage = "https://github.com/KyleKing/mdformat-mkdocs";
changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/${src.tag}";
changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ aldoborrero ];
};
}
})
@@ -2,26 +2,32 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
flit-core,
# dependencies
mdformat,
mdformat-footnote,
mdformat-frontmatter,
mdformat-tables,
mdformat-front-matters,
mdformat-gfm,
mdit-py-plugins,
ruamel-yaml,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-myst";
version = "0.2.1";
version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mdformat-myst";
tag = "v${version}";
hash = "sha256-Ty9QOsOTCNfhdLVuLfD0x63OFfHhODr14i/dhN+Sqnc=";
tag = finalAttrs.version;
hash = "sha256-y0zN47eK0UqTHx6ft/OrczAjdHdmPKIByCnz1c1JURQ=";
};
build-system = [ flit-core ];
@@ -29,8 +35,8 @@ buildPythonPackage rec {
dependencies = [
mdformat
mdformat-footnote
mdformat-frontmatter
mdformat-tables
mdformat-front-matters
mdformat-gfm
mdit-py-plugins
ruamel-yaml
];
@@ -42,8 +48,8 @@ buildPythonPackage rec {
meta = {
description = "Mdformat plugin for MyST compatibility";
homepage = "https://github.com/executablebooks/mdformat-myst";
changelog = "https://github.com/executablebooks/mdformat-myst/releases/tag/v${version}/CHANGELOG.md";
changelog = "https://github.com/executablebooks/mdformat-myst/releases/tag/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mattkang ];
};
}
})
@@ -8,7 +8,7 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-nix-alejandra";
version = "0.1.0";
pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "aldoborrero";
repo = "mdformat-nix-alejandra";
tag = version;
tag = finalAttrs.version;
hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g=";
};
@@ -25,9 +25,12 @@ buildPythonPackage rec {
--replace-fail '"alejandra"' '"${lib.getExe alejandra}"'
'';
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [ mdformat ];
pythonRelaxDeps = [
"mdformat"
];
dependencies = [ mdformat ];
pythonImportsCheck = [ "mdformat_nix_alejandra" ];
@@ -35,8 +38,9 @@ buildPythonPackage rec {
meta = {
description = "Mdformat plugin format Nix code blocks with alejandra";
changelog = "https://github.com/aldoborrero/mdformat-nix-alejandra/releases/tag/${finalAttrs.src.tag}";
homepage = "https://github.com/aldoborrero/mdformat-nix-alejandra";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ aldoborrero ];
};
}
})
@@ -4,30 +4,40 @@
fetchFromGitHub,
flit-core,
mdformat,
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat-simple-breaks";
version = "0.0.1";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "csala";
repo = "mdformat-simple-breaks";
tag = "v${version}";
hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0=";
tag = "v${finalAttrs.version}";
hash = "sha256-w0qPxIlCFMvs7p2Lya/ATkQN9wVt8ipsePZgonN/qpc=";
};
nativeBuildInputs = [ flit-core ];
build-system = [
flit-core
];
propagatedBuildInputs = [ mdformat ];
dependencies = [
mdformat
];
pythonImportsCheck = [ "mdformat_simple_breaks" ];
nativeCheckInputs = [
pytestCheckHook
];
meta = {
description = "Mdformat plugin to render thematic breaks using three dashes";
changelog = "https://github.com/csala/mdformat-simple-breaks/releases/tag/${finalAttrs.src.tag}";
homepage = "https://github.com/csala/mdformat-simple-breaks";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ aldoborrero ];
};
}
})
@@ -1,49 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build dependencies
flit-core,
# dependencies
mdformat,
wcwidth,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "mdformat-tables";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mdformat-tables";
tag = "v${version}";
hash = "sha256-7MbpGBGprhGrQ9P31HUU2h0bjyHWap6DETVN/dCDA1w=";
};
build-system = [ flit-core ];
dependencies = [
mdformat
wcwidth
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "mdformat_tables" ];
meta = {
description = "Mdformat plugin for rendering tables";
homepage = "https://github.com/executablebooks/mdformat-tables";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
aldoborrero
polarmutex
];
};
}
@@ -1,16 +1,17 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
markdown-it-py,
pytestCheckHook,
pythonOlder,
setuptools,
versionCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mdformat";
version = "0.7.22";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -18,15 +19,18 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mdformat";
tag = version;
hash = "sha256-WvbGCqfzh7KlNXIGJq09goiyLzVgU7c1+qmsLrIW38k=";
tag = finalAttrs.version;
hash = "sha256-fo4xO4Y89qPAggEjwuf6dnTyu1JzhZVdJyUqGNpti7g=";
};
build-system = [ setuptools ];
dependencies = [ markdown-it-py ];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
versionCheckHook
];
pythonImportsCheck = [ "mdformat" ];
@@ -37,7 +41,7 @@ buildPythonPackage rec {
meta = {
description = "CommonMark compliant Markdown formatter";
homepage = "https://mdformat.rtfd.io/";
changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md";
changelog = "https://github.com/executablebooks/mdformat/blob/${finalAttrs.src.tag}/docs/users/changelog.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
fab
@@ -45,4 +49,4 @@ buildPythonPackage rec {
];
mainProgram = "mdformat";
};
}
})
@@ -9,16 +9,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "meross-iot";
version = "0.4.10.3";
version = "0.4.10.4";
pyproject = true;
src = fetchFromGitHub {
owner = "albertogeniola";
repo = "MerossIot";
tag = version;
hash = "sha256-VxwOigIyLTeP1P9uyiavsu14zTjuLCZuka+2cLqJDUw=";
tag = finalAttrs.version;
hash = "sha256-9y8/q218hD7BZIbjJvzwmc9bEzWZI+OrA8ERW36ya3w=";
};
build-system = [ setuptools ];
@@ -39,8 +39,8 @@ buildPythonPackage rec {
meta = {
description = "Python library to interact with Meross devices";
homepage = "https://github.com/albertogeniola/MerossIot";
changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}";
changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${finalAttrs.src.tag}";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -33,14 +33,14 @@
buildPythonPackage (finalAttrs: {
pname = "meshtastic";
version = "2.7.6";
version = "2.7.7";
pyproject = true;
src = fetchFromGitHub {
owner = "meshtastic";
repo = "python";
tag = finalAttrs.version;
hash = "sha256-5MvIv9/v5feqbLN60PFps0xr+k+AOczVsLwnlCJJDZI=";
hash = "sha256-dpO5mYdEagJ/dDiKV7vJMRdQAZN0GY7/Sf6/kkHRpCM=";
};
pythonRelaxDeps = [
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pycollada";
version = "0.9.2";
version = "0.9.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-fKEiZ74KK5PkldYDbmsnQCOpRX3tZBlU6wxHDv4VPW4=";
hash = "sha256-w01tzw/i66WJb3HJbTehwP4aYfCEQPoM/Ow9woldMwI=";
};
build-system = [
@@ -7,9 +7,9 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pydevccu";
version = "0.1.20";
version = "0.1.21";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SukramJ";
repo = "pydevccu";
tag = version;
hash = "sha256-DqXekG5WyXuEwn4lmsTBzRxlGBHGWFXOh3Mg/u9O7X8=";
tag = finalAttrs.version;
hash = "sha256-RroFOnGOU7JDpe2mv44jKhyduT4jg8ySYtdhhPrSfvw=";
};
postPatch = ''
@@ -40,8 +40,8 @@ buildPythonPackage rec {
meta = {
description = "HomeMatic CCU XML-RPC Server with fake devices";
homepage = "https://github.com/SukramJ/pydevccu";
changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${src.tag}";
changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -6,16 +6,16 @@
requests,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pylacus";
version = "1.21.0";
version = "1.21.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ail-project";
repo = "PyLacus";
tag = "v${version}";
hash = "sha256-YTHFA25c9EnXlOKmJd2sdrdYZ+5tAopvpWRfW8IpDpU=";
tag = "v${finalAttrs.version}";
hash = "sha256-EqsQGcZjmP0dGOLuv2AFMsmUlL4ERDpBM1ivsNVNmCU=";
};
build-system = [ poetry-core ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
meta = {
description = "Module to enqueue and query a remote Lacus instance";
homepage = "https://github.com/ail-project/PyLacus";
changelog = "https://github.com/ail-project/PyLacus/releases/tag/${src.tag}";
changelog = "https://github.com/ail-project/PyLacus/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "python-gvm";
version = "26.9.0";
version = "26.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "python-gvm";
tag = "v${finalAttrs.version}";
hash = "sha256-9aqX6/Xb0E4+Ar95NwaCXxPTF0m9zLgzQSSacQqaPyc=";
hash = "sha256-ZClhWPo0Tnx62RE/YzADq2QmUnpWdPBX98IIXK0sfOA=";
};
build-system = [ poetry-core ];
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
rocmUpdateScript,
cmake,
pkg-config,
@@ -21,12 +20,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "amdsmi";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "rocm";
repo = "amdsmi";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s=";
hash = "sha256-BGe3+8YFwu41ZVAF+VtN5Cn9pfzGxmCg/Rpq8qWOEoM=";
};
postPatch = ''
@@ -43,11 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(fetchpatch {
name = "fix-build-with-gcc15.patch";
url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch";
hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw=";
})
# Fix error: redefinition of 'struct drm_color_ctm_3x4'
# https://github.com/ROCm/amdsmi/pull/165
./drm-struct-redefinition-fix.patch
];
nativeBuildInputs = [
@@ -0,0 +1,35 @@
From b8b4a6bcfe35ba9539a120cfd16573123ddd9241 Mon Sep 17 00:00:00 2001
From: "Sv. Lockal" <lockalsash@gmail.com>
Date: Mon, 15 Dec 2025 03:46:35 +0800
Subject: [PATCH] Fix compilation with libdrm-2.4.130
Fix error: redefinition of 'struct drm_color_ctm_3x4'.
drm_color_ctm_3x4 structure is now defined in https://github.com/torvalds/linux/commit/e5719e7f19009d4fbedf685fc22eec9cd8de154f#diff-4c51fb416ec7cc69566cd7b795ee57eb070aa1006ad65d6962081f039ffb2718
As this structure is unused and not a part of amdsmi public interface,
it is safe to remove it.
---
include/amd_smi/impl/amdgpu_drm.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/include/amd_smi/impl/amdgpu_drm.h b/include/amd_smi/impl/amdgpu_drm.h
index b56a5ac4b..0e483d13b 100644
--- a/include/amd_smi/impl/amdgpu_drm.h
+++ b/include/amd_smi/impl/amdgpu_drm.h
@@ -1625,15 +1625,6 @@ struct drm_amdgpu_info_uq_metadata {
#define AMDGPU_FAMILY_GC_11_5_0 150 /* GC 11.5.0 */
#define AMDGPU_FAMILY_GC_12_0_0 152 /* GC 12.0.0 */
-/* FIXME wrong namespace! */
-struct drm_color_ctm_3x4 {
- /*
- * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude
- * (not two's complement!) format.
- */
- __u64 matrix[12];
-};
-
#if defined(__cplusplus)
}
#endif
@@ -8,13 +8,13 @@
stdenv.mkDerivation {
pname = "aqlprofile";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "aqlprofile";
tag = "rocm-7.0.2";
hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg=";
tag = "rocm-7.1.1";
hash = "sha256-MAZUHo52gb0aZSFnKugMlXxcDkmMwhy1AFF1RDRgRVk=";
};
env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1";
+7 -15
View File
@@ -70,7 +70,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clr";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "clr";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw=";
hash = "sha256-ofsq1uqMixtum5C6cp/UgTDpgGPfj+rAd6PoDx5iLLw=";
};
nativeBuildInputs = [
@@ -147,14 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./cmake-find-x11-libgl.patch
(fetchpatch {
# [PATCH] improve rocclr isa compatibility check
sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg=";
url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch";
})
(fetchpatch {
# [PATCH] improve hipamd isa compatibility check
sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE=";
url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch";
# [PATCH] rocclr: Extend HIP ISA compatibility checks
sha256 = "sha256-InUSIFI1MgkfocBEoZjO2BCgXNyfF10ehh9jkTtAPXs=";
url = "https://github.com/GZGavinZhao/rocm-systems/commit/937dcfdd316b589509c061809186fe5451d22431.patch";
relative = "projects/clr";
})
];
@@ -174,10 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace opencl/khronos/icd/loader/icd_platform.h \
--replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \
'#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";'
# new unbundler has better error messages, defaulting it on
substituteInPlace rocclr/utils/flags.hpp \
--replace-fail "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, false" "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, true"
'';
postInstall = ''
@@ -245,7 +237,7 @@ stdenv.mkDerivation (finalAttrs: {
"1100"
"1101"
"1102"
# 7.x "1150"
"1150" # Strix Point
"1151" # Strix Halo
# "12-generic"
"1200" # RX 9060
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
pname = "composable_kernel_base";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "composable_kernel";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8=";
hash = "sha256-exdkyTIK03dzlCXHm3j8ehEb9NxLOxPX9QyfMsiCgSs=";
};
nativeBuildInputs = [
@@ -333,6 +333,7 @@ outer
"gfx1100"
"gfx1101"
"gfx1102"
"gfx1150"
"gfx1151"
];
gfx12 = scopeForArches [
@@ -9,7 +9,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "half";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hip-common";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "HIP";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-9VQrCed5EKVXu41Qrnf2m2jXveWt5Y/SlSxlUmjZS0M=";
hash = "sha256-aI41HdyzyE5HtCbzFmTQYGMiFyQELM/MTVOAbQsg8So=";
};
dontConfigure = true;
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hipblas-common";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "hipBLAS-common";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-NXSMVtfjei4vIjU9y4o3Px/fplq7C7ziY1R8YqnY2LQ=";
hash = "sha256-sswqYIv3c5ArT6dQ3MRru7ZZVA0VxoKW/a0pYTBpjgE=";
};
nativeBuildInputs = [
@@ -24,7 +24,7 @@
# Can also use cuBLAS
stdenv.mkDerivation (finalAttrs: {
pname = "hipblas";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipBLAS";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-SoszZBbk8sM3yjgahs1UrPCsEbGmTYTpdOw+Ah/z8H8=";
hash = "sha256-2wDnYZapJ4fU/JZpy6qOf5+DYuatWmCw/hA8WO5x2T0=";
};
postPatch = ''
@@ -43,7 +43,7 @@ let
"gfx950"
"gfx1100"
"gfx1101"
# 7.x "gfx1150"
"gfx1150"
"gfx1151"
"gfx1200"
"gfx1201"
@@ -70,7 +70,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hipblaslt${clr.gpuArchSuffix}";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
@@ -17,7 +17,7 @@
# CUB can also be used as a backend instead of rocPRIM.
stdenv.mkDerivation (finalAttrs: {
pname = "hipcub";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipCUB";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-Vx9h/DTZo7RfQrflVwXOCKiA7rt6dQQw/P/bllgtq8w=";
hash = "sha256-3/499pX7hFKJwbhSEH3/bMhNdyabK36jLv8s5TC2fuw=";
};
nativeBuildInputs = [
@@ -21,7 +21,7 @@
# Can also use cuFFT
stdenv.mkDerivation (finalAttrs: {
pname = "hipfft";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipFFT";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-cozwHUlqACq0IM3YToc/xFB694DJ3rPiEPUCTo0xuHY=";
hash = "sha256-6FyI9s6H/lHFhm8aUqB9+vvJ0CRIVWCFLNoJprvsI6o=";
fetchSubmodules = true;
};
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hipfort";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "hipfort";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-s/VOaU5IKZYH0Vhtjl/UZTrnpLsJ7zWFTvAJY2x3AcA=";
hash = "sha256-IVLhp8rYtKhkt8K8Mc0qyrp670oKoK0QeclnJjO36pY=";
};
patches = [
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hipify";
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "HIPIFY";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-xcWUYfZvbTHs4BvDiXAOLONfLiCq9uEGOHSK/hOWg7c=";
hash = "sha256-NbFFHAAvMGpvIryhEbktN5w03Cpay9lEqelqkUT9dpQ=";
};
strictDeps = true;
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hiprand";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipRAND";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-yOLdFQ4/OGGfX75A/ElY1xD+4nkcqT8tZx2bQZgXTx4=";
hash = "sha256-yypKwJ5p2aSAqapEHre9eOjjaFAI8Q1dDYWhwfrrdhg=";
};
nativeBuildInputs = [
@@ -21,7 +21,7 @@
# Can also use cuSOLVER
stdenv.mkDerivation (finalAttrs: {
pname = "hipsolver";
version = "7.0.2";
version = "7.1.0";
outputs = [
"out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipSOLVER";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-IZAVdu+VpSrJ/EZXymOzvrGnRLBpxUgVeaj1U+ux02M=";
hash = "sha256-n0+Xy92mBhI2vjB7pFHGt2UgPIHo9rO2ZxGxkz30Otw=";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@
# This can also use cuSPARSE as a backend instead of rocSPARSE
stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "hipSPARSE";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-hfC+QsOfDNKIZROgTZZsGbAG0yghc27PyVwCDr8MEJ8=";
hash = "sha256-zaMAsLfUYkMUiA2vnGiK0//+vZwugqt5T6xJU4FBrRo=";
};
nativeBuildInputs = [
@@ -33,7 +33,7 @@
}:
let
version = "7.0.2";
version = "7.1.1";
# major version of this should be the clang version ROCm forked from
rocmLlvmVersion = "20.0.0-rocm";
# llvmPackages_base version should match rocmLlvmVersion
@@ -115,7 +115,7 @@ let
owner = "ROCm";
repo = "llvm-project";
rev = "rocm-${version}";
hash = "sha256-gJlDFbCRsiwHgRzmwm36C3WvGfWwgPrtBNUHYmZHTB8=";
hash = "sha256-CfknIRVeR1bCKh1xzXKl3ehVp0kWT0uGrI9C1HTSKVo=";
};
llvmMajorVersion = lib.versions.major rocmLlvmVersion;
# An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
rocmUpdateScript,
pkg-config,
cmake,
@@ -59,7 +58,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "migraphx";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -75,13 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "AMDMIGraphX";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-P3jiq6i7jpfpL9/S7mc1CiNRwAt8fzy3waHKhyuYIXI=";
hash = "sha256-s6w4bF7koK4wnf6leVKBzwIB4X2ROHa3EgX6XuJIAew=";
};
patches = [
./msgpack-6-compat.patch
];
nativeBuildInputs = [
pkg-config
cmake
@@ -147,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include"
export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include -I${lib.getInclude protobuf}/include"
patchShebangs tools
# `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]`
@@ -1,29 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1dba2c8d..7795ba78 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -358,13 +358,19 @@ target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json)
find_package(SQLite3 REQUIRED)
target_link_libraries(migraphx PRIVATE SQLite::SQLite3)
-find_package(msgpackc-cxx QUIET)
-if(NOT msgpackc-cxx_FOUND)
- find_package(msgpack REQUIRED)
+# See: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x-
+# Prefer 6.x (msgpack-cxx)
+find_package(msgpack-cxx)
+if(msgpack-cxx_FOUND)
+ message(STATUS "Found msgpack-cxx (>=6.x)")
+else()
+ find_package(msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack)
+ message(STATUS "Found msgpackc-cxx (<=5.x)")
+ add_library(msgpack-cxx ALIAS msgpackc-cxx)
endif()
-target_link_libraries(migraphx PRIVATE msgpackc-cxx)
+target_link_libraries(migraphx PRIVATE msgpack-cxx)
# Make this available to the tests
-target_link_libraries(migraphx INTERFACE $<BUILD_INTERFACE:msgpackc-cxx>)
+target_link_libraries(migraphx INTERFACE $<BUILD_INTERFACE:msgpack-cxx>)
add_library(migraphx_all_targets INTERFACE)
@@ -43,7 +43,7 @@
let
# FIXME: cmake files need patched to include this properly
cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include";
version = "7.0.2";
version = "7.1.1";
# Targets outside this list will get
# error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD'
@@ -69,7 +69,7 @@ let
owner = "ROCm";
repo = "MIOpen";
rev = "rocm-${version}";
hash = "sha256-PJj2LzU5naAku+FOnMl+Ymad2beYYSS81/K/CR+l2UA=";
hash = "sha256-g0AEpuUiwKCu/doiRh9mW34W04m4ynHoarSyl6tR/aE=";
fetchLFS = true;
fetchSubmodules = true;
# WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream
@@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
"cpu"
);
version = "7.0.2";
version = "7.1.1";
src = fetchFromGitHub {
owner = "ROCm";
repo = "MIVisionX";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-SO0rE86UmX9f574ALdnnBDFceKGKTvJDQ8Lf7iSlJtA=";
hash = "sha256-aC6GUPK6ZSOAx+PHHB4gLPNAG5U/kapqX7YWilusDw8=";
};
patches = [
@@ -40,7 +40,7 @@ in
# infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros
stdenv.mkDerivation (finalAttrs: {
pname = "rccl${clr.gpuArchSuffix}";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -58,9 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "rccl";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-ByKz6TNdGVbh65ZH5PtgUbAj4qNVmOBmZ9SrOjkTbWU=";
hash = "sha256-3u7D3Gre1n+4Lf+cK+RMfCUM9c46pXZjdhGOrwIKM0w=";
};
requiredSystemFeatures = [ "big-parallel" ]; # Very resource intensive LTO
nativeBuildInputs = [
cmake
rocm-cmake
@@ -49,7 +49,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "rdc";
version = "7.0.2";
version = "7.1.1";
outputs = [
"out"
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCm";
repo = "rdc";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs=";
hash = "sha256-oJS0fBeISpgjZkaMfFl/Yq7mPOsdaZDqiRjSPv7kT1Q=";
};
patches = [

Some files were not shown because too many files have changed in this diff Show More