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

This commit is contained in:
K900
2026-02-21 23:32:48 +03:00
24 changed files with 123 additions and 99 deletions
-6
View File
@@ -21112,12 +21112,6 @@
github = "plebhash";
githubId = 147345153;
};
pleshevskiy = {
email = "dmitriy@pleshevski.ru";
github = "pleshevskiy";
githubId = 7839004;
name = "Dmitriy Pleshevskiy";
};
pluiedev = {
email = "hi@pluie.me";
github = "pluiedev";
@@ -1,8 +1,8 @@
{
"linux-canary": {
"hash": "sha256-ogiHH8HYrHGb4r6ADSJG3LHUs7VLjqWwQqKBfHamCyk=",
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.871/discord-canary-0.0.871.tar.gz",
"version": "0.0.871"
"hash": "sha256-HL6QPiKDg8io8Uhb2u2wDi+5FvwkZzHh4cqBJ6t4qOg=",
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.873/discord-canary-0.0.873.tar.gz",
"version": "0.0.873"
},
"linux-development": {
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
@@ -10,19 +10,19 @@
"version": "0.0.94"
},
"linux-ptb": {
"hash": "sha256-OlNU/DUQxjwAf6Qjqi6vUHfH6IhYJ9zSKp19hTuzVjk=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.177/discord-ptb-0.0.177.tar.gz",
"version": "0.0.177"
"hash": "sha256-X8PZkMhFYmWjeKPAvxtyBgrQAofkEpD1ow9gzm7v0LQ=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.178/discord-ptb-0.0.178.tar.gz",
"version": "0.0.178"
},
"linux-stable": {
"hash": "sha256-21ddAZveT1EXYr5cUoiIzD7uAbtF94EXW04VKGS5izM=",
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.124/discord-0.0.124.tar.gz",
"version": "0.0.124"
"hash": "sha256-AyKUq2GJjMam2r7oQjdQBhBsTYbhVtnUaTeLP4emRIE=",
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.125/discord-0.0.125.tar.gz",
"version": "0.0.125"
},
"osx-canary": {
"hash": "sha256-unXMbJ53+TFDtExOP13UdC4qA7mnu4z900gfEvN7Uys=",
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.975/DiscordCanary.dmg",
"version": "0.0.975"
"hash": "sha256-MPE+EQEvvodFJy0kLT2VQUpMJh3wuh15nhena1LeDuI=",
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.977/DiscordCanary.dmg",
"version": "0.0.977"
},
"osx-development": {
"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
@@ -30,13 +30,13 @@
"version": "0.0.107"
},
"osx-ptb": {
"hash": "sha256-Ty6WSK5n+Gp/pEmmeayy+BgRz5rZFXuFTxcqCjzEkwY=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.209/DiscordPTB.dmg",
"version": "0.0.209"
"hash": "sha256-CbdKYcJE1Yn8s27f9QXHMVmF6U1URnUdmz5M8ilzZWU=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.210/DiscordPTB.dmg",
"version": "0.0.210"
},
"osx-stable": {
"hash": "sha256-AbgvI8VJ1uRGFwglL1mqOLESliAlbFQdP4gcJf+t1PY=",
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.376/Discord.dmg",
"version": "0.0.376"
"hash": "sha256-AGFwdporeTx5D8zb7Gf5ECIM3jv4T6Z1W0BxHZ0NA8o=",
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.377/Discord.dmg",
"version": "0.0.377"
}
}
+3 -3
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-nextest";
version = "0.9.127";
version = "0.9.128";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
tag = "cargo-nextest-${finalAttrs.version}";
hash = "sha256-MLaRAzDj2mZzJF3vU47XvuK/n/tLCNhA1gz0JuOlF4Q=";
hash = "sha256-aR00LKZpa8v77Sdh/sYX4cZbZUAmtRkcf7qn1DHVX4g=";
};
# FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
./no-dtrace-macos.patch
];
cargoHash = "sha256-Lnlott0ecrdlkIggKArdh61UZRgI28hiXa5jNp3vWKc=";
cargoHash = "sha256-UOauioFwXAvt5GJXMMcI+2R4RP9lt7mdclQ7bFe5AUY=";
cargoBuildFlags = [
"-p"
+10
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -15,6 +16,15 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";
};
patches = [
# Pull upstream gcc-15 build fix.
(fetchpatch {
name = "gcc-15.patch";
url = "https://github.com/dasm-assembler/dasm/commit/ed21db28a0e9693c455d6491cdc120a5936b007a.patch";
hash = "sha256-CR5/Cs82JN63TmMRt398iWlMdt0QaLL7N2bbOiCAz9s=";
})
];
configurePhase = false;
installPhase = ''
mkdir -p $out/bin
+2 -2
View File
@@ -28,13 +28,13 @@ buildGoModule (
in
{
pname = "dms-shell";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "AvengeMedia";
repo = "DankMaterialShell";
tag = "v${finalAttrs.version}";
hash = "sha256-abNemkJQxp8E9bCNyTlAcFxKx+t1Wsc49J5NRZuyCgs=";
hash = "sha256-qPm0HLKFIN8nBiTJwA4Jq5R3KPNoMHBxkpVJ4DQ9PBI=";
};
sourceRoot = "${finalAttrs.src.name}/core";
+2 -2
View File
@@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "labwc";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "labwc";
repo = "labwc";
tag = finalAttrs.version;
hash = "sha256-aKjebrUqksLoDhHa/maI871jq/2u6YbTaNd6+hJz8uE=";
hash = "sha256-C/u11vxHmWWb8/kl0tZTOgosAvbSNb3tCvp2r0Bcb+Q=";
};
outputs = [
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20260110";
version = "20260221";
src = fetchFromGitLab {
owner = "kernel-firmware";
repo = "linux-firmware";
tag = version;
hash = "sha256-zL2ck91IBjBw/10YirxfoScEjbvEXVBR7bpLzuF3kDc=";
hash = "sha256-QHoS9+WS9IjRVhTJEFF/X8+4ZKjKwpJAvf7EqsV+qEY=";
};
postUnpack = ''
+2 -2
View File
@@ -20,14 +20,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "money-manager-ex";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "moneymanagerex";
repo = "moneymanagerex";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-U8DvJPJwShbuKlKsWylH9kUEEw8/SY8KnYWNyInhE9k=";
hash = "sha256-DE235wSfq20X3qh2L0KfFLk/54CW6l4Qn1K5r9nePQg=";
};
postPatch = ''
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-30";
version = "GE-Proton10-32";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-YZ+v+dzO70qTs3JxOAk9n7ByIYb3r8SeJBWnzjKQwuQ=";
hash = "sha256-NxZ4OJUYQdRNQTb62jRET6Ef14LEhynOASIMPvwWeNA=";
};
dontUnpack = true;
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "robin-map";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "Tessil";
repo = "robin-map";
tag = "v${finalAttrs.version}";
hash = "sha256-Hkgxiq2i0TuqMK/bI5OMOn3LkmSE40NimDjK1FBZpsA=";
hash = "sha256-jCkwwpAQj+mlZ81g+3H4w1Ofw4O6NZqDwVeGO5e+J7Q=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "serie";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "lusingander";
repo = "serie";
rev = "v${finalAttrs.version}";
hash = "sha256-iHhm71z1DH2oDcgl5bwFVO0U5ks0LmoqMrlUZfIQkf4=";
hash = "sha256-cnuQ6gAL0YRv0DIjuXstPmFRyfQh7c+MHZkc3lzRcRo=";
};
cargoHash = "sha256-9jWXr/43zPe+7VpbRHj5k8eptXnhMKU073KAKJtG5+E=";
cargoHash = "sha256-SavJ6OsTxWUWFWxyfq3B/maqqTRIRiBmwIeXAH3+ZCw=";
nativeCheckInputs = [ gitMinimal ];
+1 -4
View File
@@ -65,9 +65,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.mpl20;
platforms = lib.platforms.unix;
mainProgram = "sonic";
maintainers = with lib.maintainers; [
pleshevskiy
anthonyroussel
];
maintainers = with lib.maintainers; [ anthonyroussel ];
};
}
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule (finalAttrs: {
pname = "sops";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "getsops";
repo = finalAttrs.pname;
tag = "v${finalAttrs.version}";
hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU=";
hash = "sha256-fmOBEu/WnDyk6Nd4vwAs9Qdr4XlXNGJPX9bX9JymEWA=";
};
vendorHash = "sha256-9bB3MbE03KEaxUp0VvCnNVKUY4zSUoam8h2cDlAz7RY=";
vendorHash = "sha256-dniVUk/PsF111UCujFY6zIKR1cp8c8ZawH2ywMef9hE=";
subPackages = [ "cmd/sops" ];
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "video-compare";
version = "20250928";
version = "20260214";
src = fetchFromGitHub {
owner = "pixop";
repo = "video-compare";
tag = finalAttrs.version;
hash = "sha256-md+h39tMbd07pHZzQ1eae5QCkqYErMoD6oEYov9lLBU=";
hash = "sha256-yHdotE//7b463AhGlzgRqv0FefW6pZnFSDXYEVgdBHY=";
};
postPatch = ''
+2 -11
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
glslang,
@@ -13,23 +12,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vulkanscenegraph";
version = "1.1.12";
version = "1.1.13";
src = fetchFromGitHub {
owner = "vsg-dev";
repo = "VulkanSceneGraph";
tag = "v${finalAttrs.version}";
hash = "sha256-DdTfn8URLJkF5Nhkl8ZCq+brKK/T+9FipaeTON4Dsfw=";
hash = "sha256-6Jxk94GPUaPxcv4dHTQKnE7n8b/2neG2Mrv94vc9ckU=";
};
patches = [
# make it compatible with glslang 16.x
(fetchpatch {
url = "https://github.com/vsg-dev/VulkanSceneGraph/commit/313865d420bba7bb3327460c367c7526f566a74e.patch";
hash = "sha256-hytv79AE70S/yBiI+n9RHGbHmYZW5388BiFh9l1auzU=";
})
];
nativeBuildInputs = [
cmake
pkg-config
+3 -3
View File
@@ -5,7 +5,7 @@
}:
let
pname = "winbox";
version = "4.0rc3";
version = "4.0.1";
metaCommon = {
description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
x86_64-zip = callPackage ./build-from-zip.nix {
inherit pname version metaCommon;
hash = "sha256-BbdKrGMfHhm9DHCmQwfZhsjpJXamNYJ4Mh4z/fwDFlM=";
hash = "sha256-jsLQiSn9Q0xLiIgfM1S99gsFfs0vtUlh3ZEt9X4yanA=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
hash = "sha256-KBKl4KAOeXlZIW5NtFV2k/yf6Evbwf02viX4Z73Jub8=";
hash = "sha256-ND/1kOsaBnTG8yx+YH48T3jw0KCkgtsf/MuseAVrw0Y=";
};
in
(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "witr";
version = "0.2.7";
version = "0.3.0";
src = fetchFromGitHub {
owner = "pranshuparmar";
repo = "witr";
tag = "v${finalAttrs.version}";
hash = "sha256-myVl7mphBAc4BnWL62+X3hSfAkk/s0CmsZlM65n0HN0=";
hash = "sha256-HMaFus6sT2+lUauXsADKnCSeQZFEWNUmfRfgYkT3CJY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
+2 -2
View File
@@ -8,13 +8,13 @@
}:
let
pname = "workout-tracker";
version = "2.5.1";
version = "2.6.0";
src = fetchFromGitHub {
owner = "jovandeginste";
repo = "workout-tracker";
tag = "v${version}";
hash = "sha256-S7rKa79w5Lqv8QBKNc8Zp35GOOBN4JnoNE7FNWsCzoY=";
hash = "sha256-bSeZkUzcRrdH3jSagj842DoxKBf0ysNuINY/g+VWkl0=";
};
assets = buildNpmPackage {
@@ -2,22 +2,26 @@
lib,
buildPythonPackage,
fetchPypi,
# build-system
cmake,
ninja,
pybind11,
scikit-build-core,
# dependencies
numpy,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "awkward-cpp";
version = "51";
version = "52";
pyproject = true;
src = fetchPypi {
pname = "awkward_cpp";
inherit version;
hash = "sha256-jHTo+fslAXZtGw+fLrh3fjhEEdM1NKj6Zn1WWZIjoEs=";
inherit (finalAttrs) version;
hash = "sha256-7xQesgVE3yYblzyYbPrle+MpAiBhvoaBdQat1nZZcnU=";
};
build-system = [
@@ -39,4 +43,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})
@@ -22,16 +22,16 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "awkward";
version = "2.8.11";
version = "2.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "awkward";
tag = "v${version}";
hash = "sha256-76DeL/KIna8Hd9eukCzuRXKO+awkbpc4trCeKTSfGmA=";
tag = "v${finalAttrs.version}";
hash = "sha256-ovbhCPTNxyfL7tkvBCiHF0kZt0l0oMSpdsE4E9S4JJY=";
};
build-system = [
@@ -68,8 +68,8 @@ buildPythonPackage rec {
meta = {
description = "Manipulate JSON-like data with NumPy-like idioms";
homepage = "https://github.com/scikit-hep/awkward";
changelog = "https://github.com/scikit-hep/awkward/releases/tag/${src.tag}";
changelog = "https://github.com/scikit-hep/awkward/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})
@@ -1,8 +1,10 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
pythonAtLeast,
util-linux,
# build-system
setuptools,
@@ -29,6 +31,7 @@
# tests
hypothesis,
psutil,
pytest-asyncio,
pytest-cov-stub,
pytest-mock,
@@ -39,18 +42,25 @@
versionCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "dask";
version = "2026.1.1";
version = "2026.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "dask";
repo = "dask";
tag = version;
hash = "sha256-PCxIryFPwoSQ4xUA2lM6cPVzgBvr6RYikxvpjLXxjwQ=";
tag = finalAttrs.version;
hash = "sha256-cyeAU5r8uYb7aAII9HztKY+3On44/nOC9eU9stYYWzE=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace dask/tests/test_system.py \
--replace-fail \
'"taskset",' \
'"${lib.getExe' util-linux "taskset"}",'
'';
build-system = [
setuptools
setuptools-scm
@@ -91,6 +101,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
hypothesis
psutil
pyarrow
pytest-asyncio
pytest-cov-stub
@@ -101,8 +112,8 @@ buildPythonPackage rec {
pytestCheckHook
versionCheckHook
]
++ optional-dependencies.array
++ optional-dependencies.dataframe;
++ finalAttrs.passthru.optional-dependencies.array
++ finalAttrs.passthru.optional-dependencies.dataframe;
pytestFlags = [
# Rerun failed tests up to three times
@@ -143,4 +154,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
})
@@ -25,16 +25,16 @@
zict,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "distributed";
version = "2026.1.1";
version = "2026.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "dask";
repo = "distributed";
tag = version;
hash = "sha256-xriIsrdFNSHAO9SmdowXK9uPW06ziz9uGie3PkYncqo=";
tag = finalAttrs.version;
hash = "sha256-VkZ9rd+eVyfwfRMSAqriR8UjdlqsqHYCkCHZJnk0VOU=";
};
build-system = [
@@ -70,8 +70,8 @@ buildPythonPackage rec {
meta = {
description = "Distributed computation in Python";
homepage = "https://distributed.readthedocs.io/";
changelog = "https://github.com/dask/distributed/releases/tag/${src.tag}";
changelog = "https://github.com/dask/distributed/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ teh ];
};
}
})
@@ -7,20 +7,35 @@
altgraph,
setuptools,
pyinstaller,
bashNonInteractive,
coreutils,
}:
let
coreutils' = coreutils.override { singleBinary = false; };
in
buildPythonPackage rec {
pname = "macholib";
version = "1.16.3";
version = "1.16.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ronaldoussoren";
repo = "macholib";
rev = "v${version}";
hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY=";
hash = "sha256-+7dFPwzwKmvtDY/blLNyrNDEATcgo+BUceoSGg55gbo=";
};
# test_command_line.py::test_shared_main requires that /bin/sh and
# /bin/ls exist and are regular executables (not symlinks).
# It also dislikes something about the real /bin.
postPatch = lib.optionalString doCheck ''
substituteInPlace macholib_tests/test_command_line.py \
--replace-fail '"/bin/sh"' '"${lib.getExe' bashNonInteractive "bash"}"' \
--replace-fail '"/bin/ls"' '"${lib.getExe' coreutils' "ls"}"' \
--replace-fail '"/bin"' '"${lib.getBin coreutils'}/bin"'
'';
build-system = [ setuptools ];
dependencies = [
@@ -30,6 +45,8 @@ buildPythonPackage rec {
# Checks assume to find darwin specific libraries
doCheck = stdenv.buildPlatform.isDarwin;
nativeCheckInputs = [
bashNonInteractive
coreutils'
unittestCheckHook
];
@@ -25,7 +25,7 @@
xxhash,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "uproot";
version = "5.7.1";
pyproject = true;
@@ -33,7 +33,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot5";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-06pMcL2o5hHZLEbi8vdYhAAs5BBkHAskNHUB1o48KDU=";
};
@@ -103,8 +103,8 @@ buildPythonPackage rec {
meta = {
description = "ROOT I/O in pure Python and Numpy";
homepage = "https://github.com/scikit-hep/uproot5";
changelog = "https://github.com/scikit-hep/uproot5/releases/tag/v${version}";
changelog = "https://github.com/scikit-hep/uproot5/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})