Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-11-01 06:05:39 +00:00
committed by GitHub
42 changed files with 992 additions and 691 deletions
@@ -24,8 +24,8 @@ let
sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
};
latestVersion = {
version = "2025.2.2.1"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 1"
sha256Hash = "sha256-sSp9IpGpo7pE0x7C5wSmZiGKt2uLoUlNVh7NHF4j/N4=";
version = "2025.2.2.3"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 3"
sha256Hash = "sha256-lhqGfHUSUJw4IQryJprqvJuGMUVHHem3xf7CeeZ7kCo=";
};
in
{
@@ -100,13 +100,13 @@
"vendorHash": null
},
"bpg_proxmox": {
"hash": "sha256-OCgBc+rQnWnehgzZRymsCsLkr13tW9wB+aY7lKBlgRo=",
"hash": "sha256-VVLezja8qq+2sZHwHsXJ5oIAG76+Z60hkcGP7oNPIqA=",
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
"owner": "bpg",
"repo": "terraform-provider-proxmox",
"rev": "v0.85.1",
"rev": "v0.86.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-XivDgvuoSq8fboZTOa5yh3t+k1ouHEhhF4iwlrhEfCo="
"vendorHash": "sha256-01KdQygPJap5cmk8bItHCtHIbBYHYti20KNQDj4uC68="
},
"brightbox_brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -1174,13 +1174,13 @@
"vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
},
"scaleway_scaleway": {
"hash": "sha256-ArjX1/OCR9rKGAGg4o5Rd98n8n8l7+Toz5XlH5A/LSE=",
"hash": "sha256-E0nhKVAJavR7ZEz65p4fE2Iwtchmzs9Fu/UqrVFmnIA=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.60.5",
"rev": "v2.61.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PWUXuCrZz78ggiXo4DVb/C75cB8gzbQD9H0vdJZCUII="
"vendorHash": "sha256-QzFIhUMJqslwir+fa50vMZvROJfp4j2SCUKjlXLTs8s="
},
"scottwinkler_shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "aks-mcp-server";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "Azure";
repo = "aks-mcp";
rev = "v${finalAttrs.version}";
hash = "sha256-LhFFmzL9jTrUqYlHNMWVZBuiZFB0oFLA409byFWFIl0=";
hash = "sha256-RWBZevNiWbG4luw70gXIvyk+IQkH6xIDBd7uD8eq3r8=";
};
vendorHash = "sha256-tglqpX/SbqcqMXkByrzuadczXLPvPFXvslNkh1rSgWU=";
vendorHash = "sha256-8EV8cqta0DVrRFtig+Rx8SWxgAl6qu9wVVLWRhtl6N4=";
subPackages = [ "cmd/aks-mcp" ];
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "await";
version = "2.1.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "slavaGanzin";
repo = "await";
tag = version;
hash = "sha256-p0rB1fPfBL1Vj4p7IZtmLhfB5LwwyRaiCVSeDZAXJAo=";
hash = "sha256-UfEjcf8NuLRzu/57aS738Do/lXzYX5lrus1xgZ7dask=";
};
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -28,18 +28,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.31.11";
version = "1.31.12";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-CnRB/iS1NZ0Ebsi12wXFvVb0qdv0V9q1oC3nLj13mqs=";
hash = "sha256-gbSyybWTG38mI3r6kdOHFaEx7S82x25OMPEAWZql7Mo=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-50xy1nqDctgz/lXd5JsfaU6yxDoRCQRtiYBwuEuiKFA=";
hash = "sha256-w8dcbaJBCsn02JFPXzhOj2Ozuti0Xkr6mssdZhYKEFs=";
};
postPatch = ''
+2
View File
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ];
enableParallelBuilding = true;
# tests are flaky / timing sensitive on FreeBSD
enableParallelChecking = !stdenv.hostPlatform.isFreeBSD;
# Normal check and install check largely execute the same test suite
doCheck = false;
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "codeberg-pages";
version = "6.3";
version = "6.4";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "Codeberg";
repo = "pages-server";
rev = "v${version}";
hash = "sha256-5+4yKcXyKSg7Q2h7W3G6AYkIOmYA4D4DDjdLK57lwdw=";
hash = "sha256-xNsob0fW6SaqVKBIgRFj0YZUymHKWWfWZ5UqGkHWOmA=";
};
vendorHash = "sha256-EefUX5MEQrJGtUbX/bINcMSJQjnnLzKQt04hENY8G2E=";
vendorHash = "sha256-nSFUBIO3ssnwVHcjHRgUWjIK+swZP9PEJOTwM7esIgo=";
postPatch = ''
# disable httptest
+2 -2
View File
@@ -17,13 +17,13 @@
}:
let
version = "0.209.5";
version = "0.209.6";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-3qpuRutCCKJWYvHao4Ez9El40QYflhzhW4NTmi4hG1Q=";
hash = "sha256-WTfLnd2w9maCrCVHkJUZrry4LloiimNWZxRYVgHRyT8=";
};
vendorHash = "sha256-SVdoeioBtUa+V2n717ckYCQBFmYSXdi7ryRVfb9xKnY=";
+3 -3
View File
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation {
pname = "gelasio";
version = "0-unstable-2022-06-09";
version = "0-unstable-2025-06-30";
src = fetchFromGitHub {
owner = "SorkinType";
repo = "Gelasio";
rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5";
hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI=";
rev = "4d7a1d2c662582095982a3851e50d7f1e034255b";
hash = "sha256-GfJjpiTBayNfGULf3vqFOvQw9rqXIe8JJmF3fI9Km+Y=";
};
dontBuild = true;
+1 -1
View File
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
pname = "immich-cli";
version = "2.2.97";
version = "2.2.99";
inherit (immich) src pnpmDeps;
postPatch = ''
@@ -22,6 +22,10 @@ python.pkgs.buildPythonApplication rec {
"pydantic-settings"
];
pythonRemoveDeps = [
"setuptools"
];
build-system = with python.pkgs; [
hatchling
cython
@@ -45,6 +49,7 @@ python.pkgs.buildPythonApplication rec {
gunicorn
huggingface-hub
tokenizers
rapidocr
]
++ uvicorn.optional-dependencies.standard;
+3 -3
View File
@@ -34,7 +34,7 @@
}:
let
pnpm = pnpm_10;
version = "2.1.0";
version = "2.2.1";
esbuild' = buildPackages.esbuild.override {
buildGoModule =
@@ -108,14 +108,14 @@ let
owner = "immich-app";
repo = "immich";
tag = "v${version}";
hash = "sha256-xbOzTJKutuR5/oRBUyXjZ4FWAmDnWO+nS7dQcNNRHlE=";
hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8=";
};
pnpmDeps = pnpm.fetchDeps {
pname = "immich";
inherit version src;
fetcherVersion = 2;
hash = "sha256-JqI7te2M88CVfvqEOIggGn64Ue0rkrMlC6HvSRW1CU0=";
hash = "sha256-igkO0ID0/9uPtFAXL2v5bcFbCpZK2lcYEctWBKtFKdU=";
};
web = stdenv.mkDerivation {
+3 -3
View File
@@ -34,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2025-10-28";
version = "0-unstable-2025-10-31";
src = fetchFromGitHub {
owner = "LadybirdBrowser";
repo = "ladybird";
rev = "d2b2d573879a50d8f3d568f9c35b8c660bc43013";
hash = "sha256-OOqAYUXjyoZHdXOaPqddeUfYD/SNCNZh6a9ysnEseLA=";
rev = "35c6d52d7df251555ed006091b680a2299f6390e";
hash = "sha256-2bjjM0tQebmUIM6sjtUpRyJbSjDP3E/7WOq7qR2E+k8=";
};
postPatch = ''
+16 -7
View File
@@ -6,20 +6,21 @@
installShellFiles,
pkg-config,
openssl,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "languagetool-rust";
version = "2.1.5";
version = "3.0.0";
src = fetchFromGitHub {
owner = "jeertmans";
repo = "languagetool-rust";
rev = "v${version}";
hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
hash = "sha256-LHlM+PJbBqsgOwK9Mw8oVVP+dq4IBFhxjRaXLIGxZPg=";
};
cargoHash = "sha256-MIGoGEd/N2qlcawYRLMuac4SexHEMJnOS+FbPFJIsso=";
cargoHash = "sha256-VfvdIjNIHpvN370/3y2XXxaIyEL9+tG0OcnONhs9Z2I=";
buildFeatures = [ "full" ];
@@ -31,6 +32,9 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
# requires network access
"--skip=api::server::tests::test_server_annotate"
"--skip=api::server::tests::test_server_check_multiple_and_join"
"--skip=api::server::tests::test_server_check_multiple_and_join_without_context"
"--skip=server::tests::test_server_check_data"
"--skip=server::tests::test_server_check_text"
"--skip=server::tests::test_server_languages"
@@ -39,12 +43,15 @@ rustPlatform.buildRustPackage rec {
"--skip=test_match_positions_2"
"--skip=test_match_positions_3"
"--skip=test_match_positions_4"
"--skip=src/lib/lib.rs"
"--skip=src/lib.rs"
"--skip=test_basic_check_data"
"--skip=test_basic_check_file"
"--skip=test_basic_check_files"
"--skip=test_basic_check_no_errors"
"--skip=test_basic_check_ping"
"--skip=test_basic_check_piped"
"--skip=test_basic_check_text"
"--skip=test_basic_check_stdin_verbose"
"--skip=test_check_with_dict"
"--skip=test_check_with_dicts"
"--skip=test_check_with_disabled_categories"
@@ -78,11 +85,13 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/ltrs completions zsh)
'';
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "LanguageTool API in Rust";
homepage = "https://github.com/jeertmans/languagetool-rust";
license = licenses.mit;
maintainers = with maintainers; [ name-snrl ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ name-snrl ];
mainProgram = "ltrs";
};
}
+3 -3
View File
@@ -11,9 +11,9 @@ mattermost.override {
# and make sure the version regex is up to date here.
# Ensure you also check ../mattermost/package.nix for ESR releases.
regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
version = "11.0.2";
srcHash = "sha256-2w9v/ktmqSwzcylq8ayRDZD5BsHo9tBL+9X3GRNlvd0=";
vendorHash = "sha256-JkQvj92q5FZjQWB5gGCsAz7EpHO+IckBSFoFEFi3v0A=";
version = "11.0.4";
srcHash = "sha256-odBY/TVvED7h7+u+5nSRng4rRnjt1eee7fUWjxqnAJ4=";
vendorHash = "sha256-QlBq8YlphD2YuOrdnhW8g5XXeMkESVDRvKg6i5MGA0k=";
npmDepsHash = "sha256-YU6FDsMX0QIGFatUDRos/AkgwljIBeI5w/TJt/lglw0=";
lockfileOverlay = ''
unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
+41
View File
@@ -0,0 +1,41 @@
{
autoreconfHook,
fetchFromGitHub,
lib,
libmnl,
pkg-config,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mdio-tools";
version = "1.3.1";
src = fetchFromGitHub {
owner = "wkz";
repo = "mdio-tools";
tag = finalAttrs.version;
hash = "sha256-NomChJrYwMDPXNw5r2p11kGfYUvJBHCdLXy1SA8kOaM=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ libmnl ];
postPatch = ''
substituteInPlace configure.ac \
--replace-fail "git describe --always --dirty --tags" "echo ${finalAttrs.version}"
'';
meta = {
description = "Low-level debug tools for MDIO devices";
homepage = "https://github.com/wkz/mdio-tools";
changelog = "https://github.com/wkz/mdio-tools/blob/${finalAttrs.src.rev}/ChangeLog.md";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.jmbaur ];
mainProgram = "mdio";
platforms = lib.platforms.linux;
};
})
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2025-10-24";
version = "0-unstable-2025-10-29";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "4bd6c634f204f1469ab5130fc5b65eb843e98aac";
hash = "sha256-zKgx7nQgmQyyHEobTlu92FMGPn3DABAA9KwkBaIjRsQ=";
rev = "950d5ec0f5e9dbe92b2d1b1301322ea7f75ca1de";
hash = "sha256-wclB22O0YEWwWA6zC7VByntmLeP9X5QLOb+hcFermko=";
};
vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
version = "0.5.2";
version = "0.5.4";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "refs/tags/v${version}";
hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04=";
hash = "sha256-RWquV2apUazgGiwzTc0cMzKNItJOBZDSRMp13k+mhS0=";
};
cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI=";
cargoHash = "sha256-v5jZJQHXxMENJ5EbZjoI4sZ0EpCfVZOkOX442S1TReU=";
nativeBuildInputs = [
gpgme
+10 -10
View File
@@ -1,12 +1,12 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2025-10-11
# Last updated: 2025-10-24
{ fetchurl }:
let
any-darwin = {
version = "6.9.81-2025-09-29";
version = "6.9.82-2025-10-23";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.81_250929_01.dmg";
hash = "sha256-OfHkY+hf1ZOKWnq+YewuweFz0+Qiib4KB37SuA2p7yg=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.82_251023_01.dmg";
hash = "sha256-oBhThy9NC0W6gyztHQCL88NDdQrYHzZ27RAzTGcyyRY=";
};
};
in
@@ -14,17 +14,17 @@ in
aarch64-darwin = any-darwin;
x86_64-darwin = any-darwin;
aarch64-linux = {
version = "3.2.19-2025-09-04";
version = "3.2.20-2025-10-23";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_arm64_01.deb";
hash = "sha256-OqBRxDfTz9w4cFeDSKeysPlqxaJtrp96PZieXnsjGhA=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_arm64_01.deb";
hash = "sha256-m90k4S0BAA3R4alRl+1ZfLK3q35LnCVBMUOcJpALIYU=";
};
};
x86_64-linux = {
version = "3.2.19-2025-09-04";
version = "3.2.20-2025-10-23";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_amd64_01.deb";
hash = "sha256-5M3kykJCmFZZ0VTG/K+nYRt7SIUzvc3O6yPW8ebx45A=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_amd64_01.deb";
hash = "sha256-PIq2FPB+LpnyfzE51o9eulw93/BofPrlU+PqUyYlh2M=";
};
};
}
+5 -11
View File
@@ -6,25 +6,19 @@
rustPlatform.buildRustPackage rec {
pname = "sendme";
version = "0.27.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = "sendme";
rev = "v${version}";
hash = "sha256-A1dZH7qeQTsMaJdB4UejpP/HD5tE07gCHFv2Mb1ZXWY=";
hash = "sha256-LcSQuvNXSHqaiBE6GR3rNALAYPc9Xezf5cV8Im9qYMo=";
};
cargoHash = "sha256-Iwm1VGxIBfuT3nXk5Si9gpDFJRjHBOc3nfE8DFvI5YE=";
cargoHash = "sha256-/hgkMWEokcOh3ebZ2pIunktJmuq0YpI6IixO7XoNRCk=";
__darwinAllowLocalNetworking = true;
# On Darwin, sendme invokes CoreFoundation APIs that read ICU data from the
# system. Ensure these paths are accessible in the sandbox to avoid segfaults
# during checkPhase.
sandboxProfile = ''
(allow file-read* (subpath "/usr/share/icu"))
'';
# The tests require contacting external servers.
doCheck = false;
meta = with lib; {
description = "Tool to send files and directories, based on iroh";
+4 -4
View File
@@ -10,7 +10,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tideways-daemon";
version = "1.10.0";
version = "1.11.4";
src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"x86_64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
hash = "sha256-XxKwT7VgdEZclim14H3oZNAE25DoALcpRzx/IPEE4sc=";
hash = "sha256-wHiVNkoiaPF4HhE6dnBQXlGMOTqi6Mq0L7HCIFfybRk=";
};
"aarch64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
hash = "sha256-0G9SwZHZSHgTAfB+GWTEoSGVhk+Xk8o/aX2zCcnoInI=";
hash = "sha256-5ga73KByQ2g/L23t+TOLrd3tQa4O5ehN/C26I/mbVuM=";
};
"aarch64-darwin" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
hash = "sha256-nD2d5XOxV2N4o5LiiF+ZomHXdWmVEYUIz5Yhs0awjEs=";
hash = "sha256-5fSEqaTDR0u6vnQuIv8cRuIMlfFDfw2vh9uFzAf7nTs=";
};
};
updateScript = "${
+9 -7
View File
@@ -9,15 +9,15 @@
callPackage,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wgpu-native";
version = "25.0.2.2";
version = "27.0.2.0";
src = fetchFromGitHub {
owner = "gfx-rs";
repo = "wgpu-native";
tag = "v${version}";
hash = "sha256-ihA1pfTW6EHpihL4IUv7YTsU1SLkxEM6wUDr7NiHmLc=";
tag = "v${finalAttrs.version}";
hash = "sha256-sJEDCt8DTP6FjtbROVCZVD0we0OA07wjkiLnXoQfTuc=";
fetchSubmodules = true;
};
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
"dev"
];
cargoHash = "sha256-8Axm9gIX6yW0ScV5SjB6AWlmlIeGuQYonWsGwcIH2os=";
cargoHash = "sha256-ZQiX7IZsbjlDzRNlYgpRnLfCKGAYnSwvACRMNkZPjbE=";
nativeBuildInputs = [
rustPlatform.bindgenHook
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec {
vulkan-loader
];
env.WGPU_NATIVE_VERSION = finalAttrs.version;
postInstall = ''
rm $out/lib/libwgpu_native.a
install -Dm644 ./ffi/wgpu.h -t $dev/include/webgpu
@@ -46,7 +48,7 @@ rustPlatform.buildRustPackage rec {
passthru = {
updateScript = nix-update-script { };
examples = callPackage ./examples.nix {
inherit version src;
inherit (finalAttrs) version src;
};
};
@@ -59,4 +61,4 @@ rustPlatform.buildRustPackage rec {
];
maintainers = with lib.maintainers; [ niklaskorz ];
};
}
})
@@ -19,17 +19,16 @@
meson,
ninja,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "elementary-session-settings";
# Allow disabling x11 session
# nixpkgs-update: no auto update
version = "8.0.1-unstable-2025-09-15";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "session-settings";
rev = "e708fd49356f145acd926d30683012d9488f0f9d";
hash = "sha256-wb9UUrEtwtmqtfNS2YPli99ZeY17UdJFQijTKs8mHn4=";
tag = finalAttrs.version;
hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8=";
};
/*
@@ -91,4 +90,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}
})
@@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
# The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
# This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
(lib.cmakeBool "ENABLE_LIB_ONLY" stdenv.hostPlatform.isStatic)
# Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too.
(lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD))
(lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
];
@@ -0,0 +1,33 @@
From af3a3f8205968f9e652efa7adf2a359f4eb9d9cc Mon Sep 17 00:00:00 2001
From: Alexandr Nedvedicky <sashan@openssl.org>
Date: Mon, 6 Oct 2025 09:33:09 +0200
Subject: [PATCH] OPENSSL_SYS_WINDOWS is also enabled for mingw build
the test_n() in bioprinttest.c must differentiate between
MSVC runtime libc and ming runtime libc. The function
_set_printf_count_output() must be called when openssl
is linked with MSVC libc only.
Fixes #28679
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28759)
---
test/bioprinttest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index bd99b9820ecc0..28730631bc201 100644
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -541,7 +541,7 @@ static int test_n(int i)
ptrdiff_t t;
} n = { 0 };
-#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(_set_printf_count_output)
/*
* MS CRT is special and throws an exception when %n is used even
* in non-*_s versions of printf routines, and there is a special function
@@ -422,6 +422,9 @@ in
else
./3.5/use-etc-ssl-certs.patch
)
]
++ lib.optionals stdenv.hostPlatform.isMinGW [
./3.5/fix-mingw-linking.patch
];
withDocs = true;
File diff suppressed because it is too large Load Diff
@@ -18,7 +18,7 @@ let
in
stdenv.mkDerivation {
name = "androidenv-test-suite";
version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
version = (lib.importJSON ./repo.json).latest.fingerprint or "0000000000000000";
buildInputs = lib.attrValues all-tests;
buildCommand = ''
+8 -3
View File
@@ -2,6 +2,7 @@
#!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])"
require 'json'
require 'digest'
require 'rubygems'
require 'shellwords'
require 'erb'
@@ -560,11 +561,15 @@ fixup_result = fixup(result)
# Regular installation of Android SDK would keep the previously installed packages even if they are not
# in the uptodate XML files, so here we try to support this logic by keeping un-available packages,
# therefore the old packages will work as long as the links are working on the Google servers.
output = merge input, fixup_result
output = sort_recursively(merge(input, fixup_result))
# Fingerprint the latest versions.
fingerprint = Digest::SHA256.hexdigest(output['latest'].tap {_1.delete 'fingerprint'}.to_json)[0...16]
output['latest']['fingerprint'] = fingerprint
# Write the repository. Append a \n to keep nixpkgs Github Actions happy.
STDERR.puts "Writing #{opts[:output]}"
File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n")
File.write opts[:output], (JSON.pretty_generate(output) + "\n")
# Output metadata for the nixpkgs update script.
if ENV['UPDATE_NIX_ATTR_PATH']
@@ -578,7 +583,7 @@ if ENV['UPDATE_NIX_ATTR_PATH']
cur_latest.each do |k, v|
prev = prev_latest[k]
if prev && prev != v
if k != 'fingerprint' && prev && prev != v
old_versions << "#{k}:#{prev}"
new_versions << "#{k}:#{v}"
changes << "#{k}: #{prev} -> #{v}"
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "affine-gaps";
version = "0.2.3";
version = "0.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "gata-bio";
repo = "affine-gaps";
tag = "v${version}";
hash = "sha256-GP6Ahp1LQYnKp9V7jDEeFsntMC9Qav5kWm+5bSldtyM=";
hash = "sha256-WMH2wUqzA196FSe2TpfslQVW0PGwk7lGMRSKyfCG9rg=";
};
build-system = [ hatchling ];
@@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "42.2.0";
version = "42.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "aioesphomeapi";
tag = "v${version}";
hash = "sha256-3ao0RM+NFzbsj0Ws+A19S+OGwinZI+syU8PFgqcIYMU=";
hash = "sha256-naYlRUJFYnxI3mOR+th+Sh2xSnAq67HSRdoopLLbqYo=";
};
build-system = [
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aiorussound";
version = "4.8.2";
version = "4.9.0";
pyproject = true;
# requires newer f-strings introduced in 3.12
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiorussound";
tag = version;
hash = "sha256-5g1LdltGw96EZWWj0Fei8i6l5yslQgicI/oI9jr1w0U=";
hash = "sha256-okuDbY4Dx57a7zQc+LYCwe+FOjQS+hbAzSAK47uhGFg=";
};
build-system = [ poetry-core ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "13.14.0";
version = "13.15.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioshelly";
tag = version;
hash = "sha256-yhmX5TFikTP9JbO089sHqm8QzC52z9f9JxK19qHhDyI=";
hash = "sha256-1LiBWoZNSvhTAYf5VDo4gmfTz1oiKgrkAseDOm1kYYI=";
};
build-system = [ setuptools ];
@@ -9,27 +9,30 @@
poetry-core,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "airthings-ble";
version = "1.1.1";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "vincegio";
repo = "airthings-ble";
tag = version;
hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns=";
hash = "sha256-y6vpkq3u5JKImwxevMupUVVAclUcsyrqxoIOYRK0YGQ=";
};
build-system = [ poetry-core ];
dependencies = [
async-interrupt
bleak
bleak-retry-connector
cbor2
]
++ lib.optionals (pythonOlder "3.14") [
bleak
];
nativeCheckInputs = [
@@ -5,26 +5,22 @@
cryptography,
cython,
poetry-core,
pytest-benchmark,
pytest-codspeed,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "bluetooth-data-tools";
version = "1.28.3";
version = "1.28.4";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "bluetooth-data-tools";
tag = "v${version}";
hash = "sha256-xeBqxGOyxjR/O593ctyfwASxBZIeRBTdpVI981gOw5o=";
hash = "sha256-IAGlM1B/PAPyaBIfHG3RScn8odboZMg3YmQJSfoyKR4=";
};
# The project can build both an optimized cython version and an unoptimized
@@ -40,15 +36,11 @@ buildPythonPackage rec {
dependencies = [ cryptography ];
nativeCheckInputs = [
pytest-benchmark
pytest-codspeed
pytest-cov-stub
pytest-codspeed
pytestCheckHook
];
pytestFlags = [ "--benchmark-disable" ];
pythonImportsCheck = [ "bluetooth_data_tools" ];
meta = with lib; {
@@ -2,23 +2,20 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytz,
setuptools,
}:
buildPythonPackage rec {
pname = "nsapi";
version = "3.1.2";
version = "3.1.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "aquatix";
repo = "ns-api";
tag = "v${version}";
sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w=";
hash = "sha256-Buhc0643WeX/4ZU/RkzNWiFjfEAJUtNL6uJ98unTnCg=";
};
build-system = [ setuptools ];
@@ -30,11 +27,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ns_api" ];
meta = with lib; {
meta = {
description = "Python module to query routes of the Dutch railways";
homepage = "https://github.com/aquatix/ns-api/";
changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
changelog = "https://github.com/aquatix/ns-api/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "paddleocr";
version = "3.2.0";
version = "3.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "PaddlePaddle";
repo = "PaddleOCR";
tag = "v${version}";
hash = "sha256-lrFwrbDzOYFzZEz+P0roTtQMxeWBCDZuEVviyUzM3M4=";
hash = "sha256-cXxt/SxOVDcI+00WLSySSxMDU6qSHik+MWAZ6y4wRJw=";
};
patches = [
@@ -2,9 +2,8 @@
lib,
stdenv,
buildPythonPackage,
fetchPypi,
unzip,
pythonOlder,
fetchFromGitHub,
flit-core,
libGL,
libGLU,
xorg,
@@ -22,15 +21,15 @@
}:
buildPythonPackage rec {
version = "2.0.10";
format = "setuptools";
version = "2.1.9";
pname = "pyglet";
disabled = pythonOlder "3.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck=";
extension = "zip";
src = fetchFromGitHub {
owner = "pyglet";
repo = "pyglet";
tag = "v${version}";
hash = "sha256-hdLqtSvtsj6dcpTxFAs2UO27gkUAlsdjsi624ucpGU8=";
};
# find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307).
@@ -77,6 +76,10 @@ buildPythonPackage rec {
path = '${xorg.libXi}/lib/libXi${ext}'
elif name == 'Xinerama':
path = '${xorg.libXinerama}/lib/libXinerama${ext}'
elif name == 'Xrandr':
path = '${lib.getLib xorg.libXrandr}/lib/libXrandr${ext}'
elif name == 'Xrender':
path = '${lib.getLib xorg.libXrender}/lib/libXrender${ext}'
elif name == 'Xxf86vm':
path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}'
elif name == 'harfbuzz':
@@ -115,7 +118,7 @@ buildPythonPackage rec {
EOF
'';
nativeBuildInputs = [ unzip ];
build-system = [ flit-core ];
# needs GL set up which isn't really possible in a build environment even in headless mode.
# tests do run and pass in nix-shell, however.
@@ -140,6 +143,7 @@ buildPythonPackage rec {
meta = {
homepage = "http://www.pyglet.org/";
changelog = "https://github.com/pyglet/pyglet/blob/${src.tag}/RELEASE_NOTES";
description = "Cross-platform windowing and multimedia library";
license = lib.licenses.bsd3;
# The patch needs adjusting for other platforms.
@@ -72,6 +72,7 @@ buildPythonPackage rec {
];
pythonRelaxDeps = [
"cffi"
"pyopenssl"
];
@@ -39,14 +39,14 @@
}:
buildPythonPackage rec {
pname = "wgpu-py";
version = "0.25.0";
version = "0.26.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pygfx";
repo = "wgpu-py";
tag = "v${version}";
hash = "sha256-TErwgzujuHafvSiNpfmga9GQtvGFFkDjBqe8eX/dlP8=";
hash = "sha256-TaWrodP1KtCLIKi+NOnq2U7CLGVEhnlJilD6Txt7vgo=";
};
postPatch =
@@ -0,0 +1,29 @@
{
lib,
stdenv,
kernel,
mdio-tools,
}:
stdenv.mkDerivation {
pname = "mdio-netlink";
version = "${mdio-tools.version}-${kernel.version}";
inherit (mdio-tools) src;
sourceRoot = "source/kernel";
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.commonMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
meta = {
description = "Netlink support for MDIO devices";
homepage = "https://github.com/wkz/mdio-tools";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.jmbaur ];
platforms = lib.platforms.linux;
};
}
+2
View File
@@ -566,6 +566,8 @@ in
mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
mdio-netlink = callPackage ../os-specific/linux/mdio-netlink { };
mwprocapture = callPackage ../os-specific/linux/mwprocapture { };
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };