Merge master into staging-next
This commit is contained in:
@@ -84,6 +84,7 @@ let
|
||||
"Duplex"
|
||||
"AutoNegotiation"
|
||||
"WakeOnLan"
|
||||
"WakeOnLanPassword"
|
||||
"Port"
|
||||
"Advertise"
|
||||
"ReceiveChecksumOffload"
|
||||
@@ -91,14 +92,57 @@ let
|
||||
"TCPSegmentationOffload"
|
||||
"TCP6SegmentationOffload"
|
||||
"GenericSegmentationOffload"
|
||||
"PartialGenericSegmentationOffload"
|
||||
"GenericReceiveOffload"
|
||||
"GenericReceiveOffloadHardware"
|
||||
"LargeReceiveOffload"
|
||||
"ReceivePacketSteeringCPUMask"
|
||||
"ReceiveVLANCTAGHardwareAcceleration"
|
||||
"TransmitVLANCTAGHardwareAcceleration"
|
||||
"ReceiveVLANCTAGFilter"
|
||||
"NTupleFilter"
|
||||
"ReceiveFCS"
|
||||
"ReceiveAll"
|
||||
"RxChannels"
|
||||
"TxChannels"
|
||||
"OtherChannels"
|
||||
"CombinedChannels"
|
||||
"Property"
|
||||
"ImportProperty"
|
||||
"UnsetProperty"
|
||||
"RxBufferSize"
|
||||
"RxMiniBufferSize"
|
||||
"RxJumboBufferSize"
|
||||
"TxBufferSize"
|
||||
"RxFlowControl"
|
||||
"TxFlowControl"
|
||||
"AutoNegotiationFlowControl"
|
||||
"GenericSegmentOffloadMaxBytes"
|
||||
"GenericSegmentOffloadMaxSegments"
|
||||
"UseAdaptiveRxCoalesce"
|
||||
"UseAdaptiveTxCoalesce"
|
||||
"RxCoalesceSec"
|
||||
"RxCoalesceIrqSec"
|
||||
"RxCoalesceLowSec"
|
||||
"RxCoalesceHighSec"
|
||||
"TxCoalesceSec"
|
||||
"TxCoalesceIrqSec"
|
||||
"TxCoalesceLowSec"
|
||||
"TxCoalesceHighSec"
|
||||
"RxMaxCoalescedFrames"
|
||||
"RxMaxCoalescedIrqFrames"
|
||||
"RxMaxCoalescedLowFrames"
|
||||
"RxMaxCoalescedHighFrames"
|
||||
"TxMaxCoalescedFrames"
|
||||
"TxMaxCoalescedIrqFrames"
|
||||
"TxMaxCoalescedLowFrames"
|
||||
"TxMaxCoalescedHighFrames"
|
||||
"CoalescePacketRateLow"
|
||||
"CoalescePacketRateHigh"
|
||||
"CoalescePacketRateSampleIntervalSec"
|
||||
"StatisticsBlockCoalesceSec"
|
||||
"MDI"
|
||||
"SR-IOVVirtualFunctions"
|
||||
"ReceiveQueues"
|
||||
"TransmitQueues"
|
||||
"TransmitQueueLength"
|
||||
@@ -155,8 +199,8 @@ let
|
||||
(assertRange "CombinedChannels" 1 4294967295)
|
||||
(assertInt "RxBufferSize")
|
||||
(assertInt "TxBufferSize")
|
||||
(assertRange "ReceiveQueues" 1 4096)
|
||||
(assertRange "TransmitQueues" 1 4096)
|
||||
(assertRange "ReceiveQueues" 1 16384)
|
||||
(assertRange "TransmitQueues" 1 16384)
|
||||
(assertRange "TransmitQueueLength" 1 4294967294)
|
||||
];
|
||||
};
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "148.0b15";
|
||||
version = "150.0b3";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "32d7e4b9df739d5bdab2cd54250b1c7546d26b248a62e0bbc71e4b78b12d4e3d6d9451b631a0f18568f2540141786967a33b6543256a6ec6f4f245093d37a5d5";
|
||||
sha512 = "1a1f9079b50bb632fe578be6452269db6195df0663165d3d3906897368d4d3752c51fb4ace9651881d5a4e9a5dd5dcb2bdf18efab193d80acac1c2f502ef11e1";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "keymap";
|
||||
namespace = "script.keymap";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-y9bREG1fGY6TJYW4xMUBbsAp6DSzb78tY1+iyUrGjgQ=";
|
||||
sha256 = "sha256-sbyI6ZK8HvXgMxNDtm2Tb/ub93IcdXB5PSdxoL+QIqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "censor";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "censor";
|
||||
repo = "Censor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-piRIa/weDhSve+NCtwq9vhzGyC7jmtyJ/x//llPGQn8=";
|
||||
hash = "sha256-r5GhPr7dFLVy8nyKWg0poZSjWVrLrpnUHhe4MdEThvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# not a stable interface, do not reference outside the codex package but make a copy if you need
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
{
|
||||
fetchLibrustyV8 =
|
||||
args:
|
||||
fetchurl {
|
||||
name = "librusty_v8-${args.version}";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
sha256 = args.shas.${stdenv.hostPlatform.system};
|
||||
meta = {
|
||||
inherit (args) version;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
# auto-generated file -- DO NOT EDIT!
|
||||
{ fetchLibrustyV8 }:
|
||||
|
||||
fetchLibrustyV8 {
|
||||
version = "146.4.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
|
||||
aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
|
||||
x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
|
||||
aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
|
||||
};
|
||||
}
|
||||
@@ -1,15 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
cargo,
|
||||
bubblewrap,
|
||||
clang,
|
||||
cmake,
|
||||
gitMinimal,
|
||||
libcap,
|
||||
libclang,
|
||||
librusty_v8 ? callPackage ./librusty_v8.nix {
|
||||
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
|
||||
},
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
@@ -20,18 +24,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.116.0";
|
||||
version = "0.118.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-PTsKphg3gPlBUs5oMM34RhJJ4jxvD6hand5aVjXcuZ4=";
|
||||
hash = "sha256-FdtV+CIqTInnegcXrXBxw4aE0JnNDh4GdYKwUDjSk9Y=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-X5Yh8+3UrCZfzIplb4OzFfcfoklMu3FikU9vZ6CJbfc=";
|
||||
cargoHash = "sha256-7rexlmc79eUkwcqTa8rN3GFDy1dWs+0h/SUllZqAcpM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
clang
|
||||
@@ -64,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"-Wno-error=character-conversion"
|
||||
]
|
||||
);
|
||||
RUSTY_V8_ARCHIVE = librusty_v8;
|
||||
};
|
||||
|
||||
# NOTE: part of the test suite requires access to networking, local shells,
|
||||
@@ -82,7 +87,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/codex --prefix PATH : ${lib.makeBinPath [ ripgrep ]}
|
||||
wrapProgram $out/bin/codex --prefix PATH : ${
|
||||
lib.makeBinPath ([ ripgrep ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ])
|
||||
}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -28,7 +28,12 @@ stdenv.mkDerivation {
|
||||
configFile =
|
||||
if lib.isDerivation conf || builtins.isPath conf then conf else writeText "blocks.def.h" conf;
|
||||
in
|
||||
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h";
|
||||
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h"
|
||||
+ ''
|
||||
# gcc15
|
||||
substituteInPlace dwmblocks.c \
|
||||
--replace-fail 'void termhandler()' 'void termhandler(int signum)'
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "7.7.1";
|
||||
version = "7.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-mwHtT7GAR7CdOVvFPpzqF6j1Ed5kBlJ39RyITg1BgAs=";
|
||||
hash = "sha256-kxS15ymgc8qJANYUnrm8TbuFIYsGlw23pfuuKrROQyE=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
description = "Proxy client based on ClashMeta, simple and easy to use";
|
||||
homepage = "https://github.com/chen08209/FlClash";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ VZstless ];
|
||||
};
|
||||
|
||||
core = buildGoModule {
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inputplumber";
|
||||
version = "0.75.2";
|
||||
version = "0.76.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KiSroDcaWvzr5sP0jzr1GFyk0lHbtCFJrP3g5/b3hLQ=";
|
||||
hash = "sha256-81M/nVjLw+dI/ch+l/RJvq4ClMVCQqx+IfwPVPDB6HE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VwQ38Jv5OvyBqo9BBTnpUjgNwAbWyIdUKFKXsGC6+Mo=";
|
||||
cargoHash = "sha256-x/jPB3QClaYt/9fVnuz1yDUWsurcrx/mKouHMv2QsFc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libhx";
|
||||
version = "5.3";
|
||||
version = "5.4";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
tag = "v${finalAttrs.version}";
|
||||
owner = "jengelh";
|
||||
repo = "libhx";
|
||||
hash = "sha256-q9cIZhQx1BjD7Py0VEevKwFflJ1cdFn9RcW6q52t/h8=";
|
||||
hash = "sha256-rM0J9IHjxgHsedFiCl6LA54JBHkwuHFYfoFp4j6b3Kw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.712";
|
||||
version = "0.714";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pReKrGXO7cZrSCO9ZKv4ikzs45ApZlJ0mvZPUt6+TOU=";
|
||||
hash = "sha256-TSkiVG0ORRU4+4TsAoLBYfMbB1Ki/ctn3cZDAEsRn/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mpdris2-rs";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "szclsya";
|
||||
repo = "mpdris2-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OiD6nVyy8vkwTwA2aKmZN+kxYvygI0tfVFuKdy+32hQ=";
|
||||
hash = "sha256-oiyqK7vj41d9bsXBtenc477SOrVHRkXpFljkN8MjdQg=";
|
||||
};
|
||||
cargoHash = "sha256-bPZUKpbWNUa6/XIaWB6Eel9iQo248POxY1yQybBAR8M=";
|
||||
cargoHash = "sha256-xdgUKU9YiaC3o1uH38ZjvQgR78B/1LqTPis4+XqinQ8=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace misc/mpdris2-rs.service --replace-fail "/usr/local" "$out"
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openvswitch";
|
||||
repo = "ovs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3lbehoy3hbwuM4tXbtfQCXULFr1VQpjsSQ3fZzZcR4U=";
|
||||
hash = "sha256-3FQjV4BZZpn7Loiu9Xm30cCqzkU1HgJ3sAc+I6D8OvQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "renovate";
|
||||
version = "43.76.5";
|
||||
version = "43.91.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renovatebot";
|
||||
repo = "renovate";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9DAgX6CG3Wnesp5AZqfv12KT8tRAGZXuewm7fqPVmpg=";
|
||||
hash = "sha256-HW0rI9qN/eUgEnPJPJk0m5x4S/69RgaoA/+I7GoGUyc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-LgVtV/jyJP/+fJ9XQHEsz67COUHV4RL0hfVdxph1cUg=";
|
||||
hash = "sha256-R+4TswBHCv/z5MMiLgT3M5E4b9oeIWb/wWs9PXFk3s4=";
|
||||
};
|
||||
|
||||
env.COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -34,6 +35,15 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
patches = [
|
||||
# compatibility with python3.14: set a asyncio event loop for the unit tetsts
|
||||
(fetchpatch {
|
||||
name = "fix-asyncio-event-loop.patch";
|
||||
url = "https://github.com/theobori/aioopenssl/commit/47b1a1e5593fd8c3f4dedcdbc68c17e83d5c88ec.patch";
|
||||
hash = "sha256-XdoeWS5wqmGDWRObVpjcRLyN7SF2IdVmSAUBD7U4dfI=";
|
||||
})
|
||||
];
|
||||
|
||||
# Tests that fail in when built in the Darwin sandbox.
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# address already in use
|
||||
|
||||
@@ -2,32 +2,36 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "oasatelematics";
|
||||
version = "0.3";
|
||||
format = "setuptools";
|
||||
version = "0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "panosmz";
|
||||
repo = "oasatelematics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pqjzvLeVGW5rC3lK/9WnYdCLyF1fM7GGwzEG5h2lKPA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
dependencies = [ requests ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "oasatelematics" ];
|
||||
|
||||
meta = {
|
||||
description = "Python wrapper for the OASA Telematics API";
|
||||
homepage = "https://github.com/panosmz/oasatelematics";
|
||||
changelog = "https://github.com/panosmz/oasatelematics/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user