Merge master into staging-next
This commit is contained in:
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2025-12-25";
|
||||
version = "0-unstable-2025-12-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "9e65eff7536221b42f23e6df7e4eefb570e03baa";
|
||||
hash = "sha256-biZGZCtWMcqoI60dIJwkhLa5bXPrRhsih2Rh5OkKdbo=";
|
||||
rev = "3ebf6ddb6aef21433cf2e323ad19bded912ee2f9";
|
||||
hash = "sha256-jCU0AtkKfuZOZLuRdJ6qBcRydQykYgSbbhskfmmSqOc=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "age-plugin-sss";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olastor";
|
||||
repo = "age-plugin-sss";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZcL1bty4qMWVl8zif9tAWFKZiTFklHxaAHESpapZ4WM=";
|
||||
hash = "sha256-QNu2Sp0CxYYXuMzf7X0mMYI677ICu5emOM4F9HlKhHA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sr+6Tgbm7n8gQMqZng3kyzmpMgBZaIX1oEn6nV5c89U=";
|
||||
vendorHash = "sha256-Aw7dwro6adluhQXPlZ9RZVGBAmNw539Z3c+a8TmPTXU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bit-logo";
|
||||
version = "0.1.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superstarryeyes";
|
||||
repo = "bit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VpAunQUttuuC+yrACD8piqKbiiTaAfKdJ/ZthvQijXI=";
|
||||
hash = "sha256-iLwWKn8csoRkr5H8R2kpZVZCxsL0LDWHNvNoxyM6y98=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZQ5SbjQPngVUgGklADfNSM43ks3948ilDKdmxh2sq6A=";
|
||||
vendorHash = "sha256-Zxw0NyZfM42ytn+vDExLwRgNLWsdGVLC3iNVpQd8VMw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnslookup";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ameshkov";
|
||||
repo = "dnslookup";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zgEW4ANIlwF0f6YqTQicGhGgLc9RaL7Xy0wg/ICzOK4=";
|
||||
hash = "sha256-jN1JBqCZPoLbdododPRRRGfZugyesWb1Xt+np/xXK6U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pdnKYsXBw/IjakUyQym4thnO3gXgvwNm80Ha8AUVt54=";
|
||||
vendorHash = "sha256-FFVxqnFwYsoPt2wCmMpxxe+YkSg6ry71XbFd463uXn4=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ameshkov/dnslookup/releases/tag/v${version}";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnsproxy";
|
||||
version = "0.78.1";
|
||||
version = "0.78.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = "dnsproxy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MZeRCsFUQicTj4yAefCUxKSsJTqTJX8lyp6qnFaYFcM=";
|
||||
hash = "sha256-BZ9yiw5EoSLTZux/MC8MJLV9eifQYnz+ZBzAPZaxOPI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PZPwTUGd2uzXkcnjvhPFG121/837GAe/pVfaeM0VYfY=";
|
||||
vendorHash = "sha256-NS7MsK7QXg8tcAytYd9FGvaYZcReYkO5ESPpLbzL0IQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ghatm";
|
||||
version = "0.3.7";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suzuki-shunsuke";
|
||||
repo = "ghatm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t8DjUHsbU1ovBaB2bINEG7gpm1MFQCnoanunfrrTKWU=";
|
||||
hash = "sha256-MX1VilyfxJ9GKIkDSGeAE007DyjPkWL5W4b08EqAyC4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M0FOwsyXgNr05uofTZN6XcoWU/xaGVPE4ncyzddTKEI=";
|
||||
vendorHash = "sha256-CQ2HAyBuULKbmGdJ9RmPYFr2nZYxDePoJu+k8cjKxpk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-judge";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "criyle";
|
||||
repo = "go-judge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Hk2PlpoKEpSxFwar0n5bT4skCqIVheIhq8xs3EoV9w0=";
|
||||
hash = "sha256-qSTtXLjtrwwp6ipnquzoDM6yzAtoE3WIAXqWFCuOI9s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+KPbY63wF+zh7R7OVyfBI7Nuf8kAh35dxJIIRrP5Js0=";
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpsd";
|
||||
version = "3.27.2";
|
||||
version = "3.27.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-67Zu2SAYt5zsiO+2DjWllpJe70ZQLPA9b/CupjbudGE=";
|
||||
sha256 = "sha256-pNhbZ3l1Iq6GEZWLX9oLtn5JIa/ia9U+HS/wpBWNrMs=";
|
||||
};
|
||||
|
||||
# TODO: render & install HTML documentation using asciidoctor
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubexporter";
|
||||
version = "0.7.1";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakito";
|
||||
repo = "kubexporter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cSYUR6EfRMLyPNaKDBbwWzpSy7/Gxe9UtnCz+cWHwrw=";
|
||||
hash = "sha256-GSM4sO28RpCSAJRhhntkqD3RrMyZ1zEaEVeWFTqArAE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gPjfjOOh2HZaAaZt2FIb/Zy3xYKUNxC9+30TudfnDFQ=";
|
||||
vendorHash = "sha256-+2wzD7V6De8wd8W+ML+Lr7A8bzpxVExPDg6uuvTh/zE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -16,7 +16,7 @@ php83.buildComposerProject2 (finalAttrs: {
|
||||
hash = "sha256-kjT72pLKuN166Edm8+8vUIfhFdMnZkeTagl0ECL20b8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Bk01aU3vicwk9swkv+8VZxcPdaEMOOtp9niNfPfQyA=";
|
||||
vendorHash = "sha256-wqaePPMC1OiXwtdhMJzg4AvcYDmJg2Uo2LV7TbZ00ec=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.23.1";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zM8vSQzhJqOgqKyRW7NSh/dX6pA+BRj+bExuQYmcWR4=";
|
||||
hash = "sha256-P0qTxUdyM2Ect2+GSLC0vJbAxvaLXQi1ZMFujBnGKQ0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RIhVSRjqzFawXaRZHAUwGodnNerGz+I3GbPFsP5qESY=";
|
||||
|
||||
@@ -68,13 +68,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.60.8";
|
||||
version = "0.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XM4pUYimxbO3ZCmTPbg7dwDB3x2TnL9PUgbMfjHjxmo=";
|
||||
hash = "sha256-hMg7KrD6vkpEEMQButhoVE8crEODUU01Pz+ifdQ10C4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b3Wl9jsAdYC91JM/kDo4yIF05hqbivtrcn1aRuZzP3s=";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
featureVersion ? "17",
|
||||
featureVersion ? "21",
|
||||
|
||||
lib,
|
||||
stdenv,
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "re-Isearch";
|
||||
version = "2.20220925.4.0a-unstable-2025-12-10";
|
||||
version = "2.20220925.4.0a-unstable-2025-12-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "re-Isearch";
|
||||
repo = "re-Isearch";
|
||||
rev = "dfd0c39f62d83708b72ebc9332e7029c1d9be5b6";
|
||||
hash = "sha256-BGlpXOL5TBui+5OTaxLAsiRCIcp9Rg8J2IFtXn6EeoU=";
|
||||
rev = "cff7cd6d0fdcc42e87f6e1ffb24a51f2880c061f";
|
||||
hash = "sha256-VxWhEhxTfWU4Gfsq8PY3SCxb7Gvckh0pr7GsNSdCl2w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "roadrunner";
|
||||
version = "2025.1.5";
|
||||
version = "2025.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "roadrunner";
|
||||
owner = "roadrunner-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/rCbDZ2Re+tLvpUKEFunCATBX5/tXlKjimWSWZm4ZJ4=";
|
||||
hash = "sha256-qoPQxJbZ1BH9Gy06qmp9LGWF6YPJL0gRZX3+S5ej6XY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,7 +49,7 @@ buildGoModule rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
vendorHash = "sha256-HPHkABSdfi9QIgLxW5GBalEGnM1sAd9/aESKWxkI8Yg=";
|
||||
vendorHash = "sha256-LSeQACVgBywJqHfRE2q6HxL1ADKZtrJP83U3Zd1oIDw=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";
|
||||
|
||||
@@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: {
|
||||
hash = "sha256-OYuP56KlS9onuYcy9xL0XrH9hqf/njwVUju1pDyRgKM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HGVeoy6duUfRLtx05mlZc3wCOeRTzNXJXxXurZDzZFs=";
|
||||
vendorHash = "sha256-rOFY9TymSw8MatAR/yCpKaj0LupuhaIkk7QAnaKQUZ4=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: {
|
||||
hash = "sha256-giJAcH2R9hAlUTbwRi7rbmUP+WV8Nfb9XmoHHs4RcbI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A/hAw0J4Q3kun6soxI6h7kpyGef9q0EFg8HAQHHZUro=";
|
||||
vendorHash = "sha256-K/mgYRp8vM+PC9AEJDZ9lW/XZkQ+YxHSnEY70VVX9FY=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -19,7 +19,7 @@ php.buildComposerWithPlugin {
|
||||
};
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-SL3HiYTVaUwcEfnRO932MWgOP1VRkxTl3lxLbW0qiTY=";
|
||||
vendorHash = "sha256-cup8maS9NkhdqTHoKJaH7r7AJQdkflWTvM6uIuxMPX0=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nix-community/composer-local-repo-plugin/releases/tag/${version}";
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zrHOw7Uyq8H7AyxrfCo5VthX1EeoSB44ynrRt38u3Sk=";
|
||||
vendorHash = "sha256-yfGfMAQGlXnCoww4rtynknL7qDjcQFEM8p8FbsIqJZU=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -143,6 +144,10 @@ buildPythonPackage rec {
|
||||
pytestFlags = [
|
||||
"--benchmark-disable"
|
||||
"-Wignore::FutureWarning"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# DeprecationWarning: '_UnionGenericAlias' is deprecated and slated for removal in Python 3.17
|
||||
"-Wignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
enabledTestMarks = testBackends ++ [ "core" ];
|
||||
@@ -178,6 +183,16 @@ buildPythonPackage rec {
|
||||
|
||||
# assert 0 == 3 (tests edge case behavior of databases)
|
||||
"test_self_join_with_generated_keys"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# ExceptionGroup: multiple unraisable exception warnings (4 sub-exceptions)
|
||||
"test_parse_dtype_roundtrip"
|
||||
|
||||
# AssertionError: value does not match the expected value in snapshot ...
|
||||
"test_annotated_function_without_decoration"
|
||||
"test_error_message"
|
||||
"test_error_message_when_constructing_literal"
|
||||
"test_signature_from_callable_with_keyword_only_arguments"
|
||||
];
|
||||
|
||||
# patch out tests that check formatting with black
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pythonAtLeast,
|
||||
|
||||
# buildInputs
|
||||
openssl,
|
||||
@@ -105,12 +106,18 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestMarks = [ "slow" ];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Flaky (even when the sandbox is disabled):
|
||||
# FileNotFoundError: [Errno 2] Cannot delete directory '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts':
|
||||
# Cannot get information for path '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts/.tmppyKXfw'
|
||||
"test_create_index_from_table"
|
||||
];
|
||||
disabledTests =
|
||||
lib.optionals (pythonAtLeast "3.14") [
|
||||
# TypeError: Converting Pydantic type to Arrow Type: unsupported type
|
||||
# <class 'test_pydantic.test_optional_nested_model.<locals>.WALocation'>.
|
||||
"test_optional_nested_model"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Flaky (even when the sandbox is disabled):
|
||||
# FileNotFoundError: [Errno 2] Cannot delete directory '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts':
|
||||
# Cannot get information for path '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts/.tmppyKXfw'
|
||||
"test_create_index_from_table"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# touch the network
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pythonAtLeast,
|
||||
|
||||
# nativeBuildInputs
|
||||
pkg-config,
|
||||
@@ -33,14 +34,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylance";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SPvJHa8oVgydWSvTR7RWF3ojKmz4BOJgo1fiwjCtYLU=";
|
||||
hash = "sha256-S/zVpsfoQG9NYnJyAJm+a0LllVE/lfaCua+NA9DGIsw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
@@ -52,7 +53,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-dPfj8Zd5+pW4Xe6IFaOcvcJdzcuC6qURSNJRcbceoHg=";
|
||||
hash = "sha256-5ngkyjzxQ2NVxst3t7U18hdZ5zHNo0gjv0dif9HlyhU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -101,6 +102,11 @@ buildPythonPackage rec {
|
||||
cd python/tests
|
||||
'';
|
||||
|
||||
pytestFlags = lib.optionals (pythonAtLeast "3.14") [
|
||||
# DeprecationWarning: '_UnionGenericAlias' is deprecated and slated for removal in Python 3.17
|
||||
"-Wignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Hangs indefinitely
|
||||
"test_all_permutations"
|
||||
|
||||
@@ -273,7 +273,10 @@ stdenv.mkDerivation rec {
|
||||
are expected to exist on every operating system.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ das_j ];
|
||||
maintainers = with lib.maintainers; [
|
||||
das_j
|
||||
mdaniels5757
|
||||
];
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
priority = 10;
|
||||
};
|
||||
|
||||
@@ -4742,8 +4742,8 @@ with pkgs;
|
||||
inherit (emacs.pkgs.melpaStablePackages) irony;
|
||||
};
|
||||
|
||||
openjfx17 = openjfx;
|
||||
openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
|
||||
openjfx17 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "17"; };
|
||||
openjfx21 = openjfx;
|
||||
openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
|
||||
|
||||
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
|
||||
|
||||
Reference in New Issue
Block a user