Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-04-29 00:02:23 +00:00 committed by GitHub
commit 24c668d7e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
54 changed files with 2145 additions and 397 deletions

View File

@ -3546,12 +3546,6 @@
githubId = 1118859;
name = "Scott Worley";
};
ChlorideCull = {
email = "nixrelated@chcl.se";
github = "ChlorideCull";
githubId = 4977063;
name = "Sebastian Johansson";
};
choochootrain = {
email = "hurshal@imap.cc";
github = "choochootrain";
@ -7354,12 +7348,6 @@
githubId = 104317939;
name = "gilice";
};
gilligan = {
email = "tobias.pflug@gmail.com";
github = "gilligan";
githubId = 27668;
name = "Tobias Pflug";
};
gin66 = {
email = "jochen@kiemes.de";
github = "gin66";
@ -16319,6 +16307,12 @@
githubId = 5636;
name = "Steve Purcell";
};
purrpurrn = {
email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com";
github = "purrpurrn";
githubId = 142632643;
name = "purrpurrn";
};
putchar = {
email = "slim.cadoux@gmail.com";
matrix = "@putch4r:matrix.org";

View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.1.0";
version = "24.2.5";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU=";
hash = "sha256-8Cs+uME6uXWIWeuS9cgKnlYJG/m13l2BIVNDG0bqEmc=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ=";
hash = "sha256-tQFcdZc+4N6TYY6MDAwUgpaIvqYkU681DbuYCQhvJ1c=";
};
nativeBuildInputs = [

View File

@ -33,6 +33,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/davidbrazdil/volnoti";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.gilligan ];
maintainers = [];
};
}

View File

@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk=";
hash_darwin = "sha256-RGOChK4JhrFUgVY/5YqgE0KFLRl6a7X2llw1ZfhiPXY=";
hash_darwin_aarch64 =
"sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4=";
hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y=";
version = "123.0.6312.122";
"sha256-K1jFXmWtXrS43UJg2mQ39Kae6tv7E9Fxm6LUWg+uwLo=";
hash_linux = "sha256-xwaRNh7sllyNaq8+aLAZDQ3uDg06cu3KYqc02LWPSyw=";
version = "124.0.6367.91";
};
deps = {
gn = {
@ -15,9 +15,9 @@
version = "2024-03-14";
};
};
hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog=";
hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI=";
version = "124.0.6367.60";
hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";
hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";
version = "124.0.6367.91";
};
ungoogled-chromium = {
deps = {
@ -28,12 +28,12 @@
version = "2024-03-14";
};
ungoogled-patches = {
hash = "sha256-zgkt0stU/H5Mji429tigVbjOq27Op8UppHTjG6neoeA=";
rev = "124.0.6367.60-1";
hash = "sha256-1/J3BhUlef8CH/jZ5P5fWGXnWxTiuB0Ep+AWrMrv9cE=";
rev = "124.0.6367.91-1";
};
};
hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog=";
hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI=";
version = "124.0.6367.60";
hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";
hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";
version = "124.0.6367.91";
};
}

View File

@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.0.2";
version = "33.1.0";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48=";
hash = "sha256-qjztSvNL7KNFG3sszgk5qH77do0HFQ8YTrgjFi2ZM00=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY=";
hash = "sha256-q4zAmnCN9SHGb8PthjAx7d5FKq/oAQ8c0R+U1SWqjAA=";
};
};

View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.29";
version = "3.11.30";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-rtLn3QkcVwCh2DfJmtkKvZQcFL/zlZCh7VTUpWtQErw=";
hash = "sha256-msvNZ3kE48dNnhtUWLGxulb2iZ78hhyg7fVL2OSOdyY=";
};
postPatch = ''

View File

@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/michaelrsweet/pappl";
license = licenses.asl20;
platforms = platforms.linux; # should also work for darwin, but requires additional work
maintainers = with maintainers; [ jonringer ChlorideCull ];
maintainers = with maintainers; [ jonringer ];
};
}

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "8.10.7";
version = "8.11.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-tRjyv7pTTTDj3LrcIP3OWOX+9FldHV6rtbPdOYr70E4=";
hash = "sha256-bAzhQMGI4t/ftcZnz6h/PmlDlGgMU8vFVHb9QXED/Hw=";
# https://github.com/python-versioneer/python-versioneer/issues/217
postFetch = ''
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'

View File

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/jsdw/git-backup";
description = "A tool to help you backup your git repositories from services like GitHub";
license = licenses.mit;
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "git-backup";
};
}

View File

@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/swsnr/git-gone";
changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "git-gone";
};
}

View File

@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/siedentop/git-quickfix";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "git-quickfix";
};
}

View File

@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
description = "Automatically trims your branches whose tracking remote refs are merged or gone";
homepage = "https://github.com/foriequal0/git-trim";
license = licenses.mit;
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "git-trim";
};
}

View File

@ -1,5 +1,9 @@
{ lib, fetchFromGitHub, rustPlatform, git }:
{
lib,
fetchFromGitHub,
rustPlatform,
git,
}:
rustPlatform.buildRustPackage rec {
pname = "gitprompt-rs";
version = "0.3.0";
@ -14,15 +18,15 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418";
postPatch = ''
substituteInPlace src/main.rs \
--replace 'Command::new("git")' 'Command::new("${git}/bin/git")'
substituteInPlace src/main.rs \
--replace 'Command::new("git")' 'Command::new("${git}/bin/git")'
'';
meta = with lib; {
description = "Simple Git prompt";
homepage = "https://github.com/9ary/gitprompt-rs";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ isabelroses ];
mainProgram = "gitprompt-rs";
};
}

View File

@ -69,6 +69,7 @@ let
cutter = callPackage ./cutter.nix { };
dynamic-crop = callPackage ./dynamic-crop.nix { };
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
memo = callPackage ./memo.nix { };
modernx = callPackage ./modernx.nix { };
modernx-zydezu = callPackage ./modernx-zydezu.nix { };
mpris = callPackage ./mpris.nix { };

View File

@ -0,0 +1,26 @@
{ fetchFromGitHub
, buildLua
, lib
, unstableGitUpdater
}:
buildLua {
pname = "memo";
version = "0-unstable-2023-10-31";
src = fetchFromGitHub {
owner = "po5";
repo = "memo";
rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f";
hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8=";
};
passthru.updateScript = unstableGitUpdater {};
meta = with lib; {
description = "A recent files menu for mpv";
homepage = "https://github.com/po5/memo";
license = licenses.gpl3Only;
maintainers = with lib.maintainers; [ purrpurrn ];
};
}

View File

@ -2,37 +2,45 @@
, stdenv
, fetchFromGitHub
, cmake
, ninja
, obs-studio
, onnxruntime
, opencv
, qt6
, curl
}:
stdenv.mkDerivation rec {
pname = "obs-backgroundremoval";
version = "0.5.16";
version = "1.1.13";
src = fetchFromGitHub {
owner = "royshil";
owner = "occ-ai";
repo = "obs-backgroundremoval";
rev = "v${version}";
hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc=";
rev = version;
hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio onnxruntime opencv ];
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ obs-studio onnxruntime opencv qt6.qtbase curl ];
dontWrapQtApps = true;
cmakeFlags = [
"--preset linux-x86_64"
"-DCMAKE_MODULE_PATH:PATH=${src}/cmake"
"-DUSE_SYSTEM_ONNXRUNTIME=ON"
"-DUSE_SYSTEM_OPENCV=ON"
"-DDISABLE_ONNXRUNTIME_GPU=ON"
];
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
buildPhase = ''
cd ..
cmake --build build_x86_64 --parallel
'';
installPhase = ''
cmake --install build_x86_64 --prefix "$out"
'';
meta = with lib; {
@ -40,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/royshil/obs-backgroundremoval";
maintainers = with maintainers; [ zahrun ];
license = licenses.mit;
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/michaelrsweet/lprint";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ ChlorideCull ];
maintainers = with maintainers; [ ];
};
}

View File

@ -53,14 +53,14 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "olvid";
version = "1.5.0";
version = "1.5.2";
dontUnpack = true;
dontWrapGApps = true;
src = fetchurl {
url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz";
hash = "sha256-iiMc9mM+uUVeS1i1gzXMZaMwSChdz7vNrL9uqJlR8NU=";
hash = "sha256-WjIOk3dPSXQdAR2fdXseV0NdOjld0PzyqnUx/VbvQio=";
};
nativeBuildInputs = [

View File

@ -76,9 +76,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.81"
version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
[[package]]
name = "arrayref"
@ -105,27 +105,26 @@ dependencies = [
[[package]]
name = "async-channel"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
dependencies = [
"concurrent-queue",
"event-listener 5.3.0",
"event-listener-strategy 0.5.1",
"event-listener-strategy 0.5.2",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-executor"
version = "1.10.0"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee"
checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
dependencies = [
"async-lock 3.3.0",
"async-task",
"concurrent-queue",
"fastrand 2.0.2",
"fastrand 2.1.0",
"futures-lite 2.3.0",
"slab",
]
@ -136,7 +135,7 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [
"async-channel 2.2.0",
"async-channel 2.2.1",
"async-executor",
"async-io 2.3.2",
"async-lock 3.3.0",
@ -177,8 +176,8 @@ dependencies = [
"futures-io",
"futures-lite 2.3.0",
"parking",
"polling 3.6.0",
"rustix 0.38.32",
"polling 3.7.0",
"rustix 0.38.34",
"slab",
"tracing",
"windows-sys 0.52.0",
@ -232,19 +231,19 @@ dependencies = [
[[package]]
name = "async-task"
version = "4.7.0"
version = "4.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
version = "0.1.79"
version = "0.1.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -357,18 +356,16 @@ dependencies = [
[[package]]
name = "blocking"
version = "1.5.1"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88"
dependencies = [
"async-channel 2.2.0",
"async-channel 2.2.1",
"async-lock 3.3.0",
"async-task",
"fastrand 2.0.2",
"futures-io",
"futures-lite 2.3.0",
"piper",
"tracing",
]
[[package]]
@ -489,9 +486,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.92"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
[[package]]
name = "cesu8"
@ -512,9 +509,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
version = "0.15.7"
version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
dependencies = [
"smallvec",
"target-lexicon",
@ -557,7 +554,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -610,9 +607,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "combine"
version = "4.6.6"
version = "4.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
dependencies = [
"bytes",
"memchr",
@ -620,9 +617,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
version = "2.4.0"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils",
]
@ -772,7 +769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -843,7 +840,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -876,7 +873,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
"darling_core 0.20.8",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -900,7 +897,7 @@ dependencies = [
[[package]]
name = "desktop"
version = "0.0.1"
version = "0.0.2"
dependencies = [
"freedesktop-desktop-entry",
"freedesktop-icons",
@ -968,7 +965,7 @@ dependencies = [
"prettyplease",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -1079,7 +1076,7 @@ dependencies = [
"dioxus-core",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -1161,9 +1158,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "either"
version = "1.10.0"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
[[package]]
name = "enumset"
@ -1183,7 +1180,7 @@ dependencies = [
"darling 0.20.8",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -1265,9 +1262,9 @@ dependencies = [
[[package]]
name = "event-listener-strategy"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
dependencies = [
"event-listener 5.3.0",
"pin-project-lite",
@ -1284,9 +1281,9 @@ dependencies = [
[[package]]
name = "fastrand"
version = "2.0.2"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "fdeflate"
@ -1309,9 +1306,9 @@ dependencies = [
[[package]]
name = "flate2"
version = "1.0.28"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7"
dependencies = [
"crc32fast",
"miniz_oxide",
@ -1480,7 +1477,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
"fastrand 2.0.2",
"fastrand 2.1.0",
"futures-core",
"futures-io",
"parking",
@ -1495,7 +1492,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -1822,7 +1819,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -2324,9 +2321,9 @@ dependencies = [
[[package]]
name = "lock_api"
version = "0.4.11"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
@ -2674,9 +2671,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
version = "0.12.1"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
dependencies = [
"lock_api",
"parking_lot_core",
@ -2684,15 +2681,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.9"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.48.5",
"windows-targets 0.52.5",
]
[[package]]
@ -2799,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
dependencies = [
"atomic-waker",
"fastrand 2.0.2",
"fastrand 2.1.0",
"futures-io",
]
@ -2840,15 +2837,15 @@ dependencies = [
[[package]]
name = "polling"
version = "3.6.0"
version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
dependencies = [
"cfg-if",
"concurrent-queue",
"hermit-abi",
"pin-project-lite",
"rustix 0.38.32",
"rustix 0.38.34",
"tracing",
"windows-sys 0.52.0",
]
@ -2867,12 +2864,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "prettyplease"
version = "0.2.17"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
dependencies = [
"proc-macro2",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -2917,9 +2914,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.79"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
dependencies = [
"unicode-ident",
]
@ -2935,9 +2932,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.35"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
@ -3037,11 +3034,11 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
[[package]]
name = "redox_syscall"
version = "0.4.1"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.5.0",
]
[[package]]
@ -3137,7 +3134,7 @@ dependencies = [
[[package]]
name = "rmenu"
version = "1.2.1"
version = "1.2.2"
dependencies = [
"cached 0.44.0",
"clap",
@ -3257,9 +3254,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.32"
version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.5.0",
"errno",
@ -3333,9 +3330,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
[[package]]
name = "serde"
version = "1.0.197"
version = "1.0.199"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
dependencies = [
"serde_derive",
]
@ -3352,20 +3349,20 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.197"
version = "1.0.199"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
name = "serde_json"
version = "1.0.115"
version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
dependencies = [
"itoa 1.0.11",
"ryu",
@ -3380,7 +3377,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -3639,9 +3636,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.58"
version = "2.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
dependencies = [
"proc-macro2",
"quote",
@ -3774,22 +3771,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
version = "1.0.58"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.58"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -3870,7 +3867,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -3891,7 +3888,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.22.9",
"toml_edit 0.22.12",
]
[[package]]
@ -3916,15 +3913,15 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.9"
version = "0.22.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow 0.6.5",
"winnow 0.6.7",
]
[[package]]
@ -3946,7 +3943,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
]
[[package]]
@ -4211,7 +4208,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
"wasm-bindgen-shared",
]
@ -4245,7 +4242,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.58",
"syn 2.0.60",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -4268,9 +4265,9 @@ dependencies = [
[[package]]
name = "webbrowser"
version = "0.8.14"
version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd595fb70f33583ac61644820ebc144a26c96028b625b96cafcd861f4743fbc8"
checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
dependencies = [
"core-foundation",
"home",
@ -4380,7 +4377,7 @@ dependencies = [
"either",
"home",
"once_cell",
"rustix 0.38.32",
"rustix 0.38.34",
]
[[package]]
@ -4401,11 +4398,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.6"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
dependencies = [
"winapi",
"windows-sys 0.52.0",
]
[[package]]
@ -4498,7 +4495,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.4",
"windows-targets 0.52.5",
]
[[package]]
@ -4533,17 +4530,18 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
dependencies = [
"windows_aarch64_gnullvm 0.52.4",
"windows_aarch64_msvc 0.52.4",
"windows_i686_gnu 0.52.4",
"windows_i686_msvc 0.52.4",
"windows_x86_64_gnu 0.52.4",
"windows_x86_64_gnullvm 0.52.4",
"windows_x86_64_msvc 0.52.4",
"windows_aarch64_gnullvm 0.52.5",
"windows_aarch64_msvc 0.52.5",
"windows_i686_gnu 0.52.5",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.5",
"windows_x86_64_gnu 0.52.5",
"windows_x86_64_gnullvm 0.52.5",
"windows_x86_64_msvc 0.52.5",
]
[[package]]
@ -4566,9 +4564,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
[[package]]
name = "windows_aarch64_msvc"
@ -4584,9 +4582,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
[[package]]
name = "windows_i686_gnu"
@ -4602,9 +4600,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
[[package]]
name = "windows_i686_msvc"
@ -4620,9 +4624,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
[[package]]
name = "windows_x86_64_gnu"
@ -4638,9 +4642,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
[[package]]
name = "windows_x86_64_gnullvm"
@ -4656,9 +4660,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
[[package]]
name = "windows_x86_64_msvc"
@ -4674,9 +4678,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.4"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
[[package]]
name = "winnow"
@ -4689,9 +4693,9 @@ dependencies = [
[[package]]
name = "winnow"
version = "0.6.5"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
dependencies = [
"memchr",
]

View File

@ -11,13 +11,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "rmenu";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "imgurbot12";
repo = "rmenu";
hash = "sha256-JHJZfDxrDi0rJSloPdOVdvo/XkrFhvshd7yZWn/zELU=";
hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4=";
};
nativeBuildInputs = [

View File

@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/ikatson/rqbit";
changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "rqbit";
};
}

View File

@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/harlanc/xiu";
changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "xiu";
};
}

View File

@ -25,7 +25,7 @@
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
# }
, officialRelease ? { version = "18.1.3"; sha256 = "sha256-saQGbpYd95JuudwLcdG80GL8YhadH7TUY1FC0o0ithY="; }
, officialRelease ? { version = "18.1.4"; sha256 = "sha256-LyQEb4ZJXm2hkPOM9XITIploMT2VKIQWxUFio7SXrc0="; }
# i.e.:
# {
# version = /* i.e. "15.0.0" */;

View File

@ -1,17 +1,19 @@
{ lib
, aiofiles
, buildPythonPackage
, cython
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
{
lib,
aiofiles,
buildPythonPackage,
cython,
fetchFromGitHub,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "aiocsv";
version = "1.3.1";
version = "1.3.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -20,14 +22,16 @@ buildPythonPackage rec {
owner = "MKuranowski";
repo = "aiocsv";
rev = "refs/tags/v${version}";
hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4=";
hash = "sha256-NnRLBXvQj25dSHc8ZnUaPT8Oiy2EyHLIb8IJPQliyPg=";
};
nativeBuildInputs = [
build-system = [
cython
setuptools
];
dependencies = [ typing-extensions ];
nativeCheckInputs = [
aiofiles
pytest-asyncio
@ -38,9 +42,7 @@ buildPythonPackage rec {
export CYTHONIZE=1
'';
pythonImportsCheck = [
"aiocsv"
];
pythonImportsCheck = [ "aiocsv" ];
disabledTestPaths = [
# Import issue

View File

@ -1,30 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonRelaxDepsHook
, pytestCheckHook
, aiohttp
, aiohttp-socks
, aiofiles
, aresponses
, babel
, certifi
, magic-filter
, pycryptodomex
, pytest-aiohttp
, pytest-asyncio
, pytest-lazy-fixture
, redis
, hatchling
, pydantic
, pytz
, gitUpdater
{
lib,
aiofiles,
aiohttp,
aiohttp-socks,
aresponses,
babel,
buildPythonPackage,
certifi,
fetchFromGitHub,
gitUpdater,
hatchling,
magic-filter,
pycryptodomex,
pydantic,
pytest-aiohttp,
pytest-asyncio,
pytest-lazy-fixture,
pytestCheckHook,
pythonOlder,
pythonRelaxDepsHook,
pytz,
redis,
}:
buildPythonPackage rec {
pname = "aiogram";
version = "3.4.1";
version = "3.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -33,19 +34,16 @@ buildPythonPackage rec {
owner = "aiogram";
repo = "aiogram";
rev = "refs/tags/v${version}";
hash = "sha256-2of4KHdpAATOt0dCqI3AmTJtdeN5SdiWydeGjtagABI=";
hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno=";
};
nativeBuildInputs = [
hatchling
pythonRelaxDepsHook
];
build-system = [ hatchling ];
pythonRelaxDeps = [
"pydantic"
];
nativeBuildInputs = [ pythonRelaxDepsHook ];
propagatedBuildInputs = [
pythonRelaxDeps = [ "pydantic" ];
dependencies = [
aiofiles
aiohttp
babel
@ -67,15 +65,17 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
"-W" "ignore::pluggy.PluggyTeardownRaisedWarning"
"-W" "ignore::pytest.PytestDeprecationWarning"
"-W"
"ignore::pluggy.PluggyTeardownRaisedWarning"
"-W"
"ignore::pytest.PytestDeprecationWarning"
"-W"
"ignore::DeprecationWarning"
];
pythonImportsCheck = [ "aiogram" ];
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
description = "Modern and fully asynchronous framework for Telegram Bot API";

View File

@ -1,37 +1,36 @@
{
lib,
stdenv,
buildPythonPackage,
certifi,
fastimport,
fetchFromGitHub,
gevent,
geventhttpclient,
git,
glibcLocales,
gnupg,
gpgme,
paramiko,
pytest-xdist,
pytestCheckHook,
pythonOlder,
setuptools,
setuptools-rust,
urllib3,
{ lib
, stdenv
, buildPythonPackage
, certifi
, fastimport
, fetchFromGitHub
, gevent
, geventhttpclient
, git
, glibcLocales
, gnupg
, gpgme
, paramiko
, pytest-xdist
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-rust
, urllib3
}:
buildPythonPackage rec {
version = "0.21.7";
pname = "dulwich";
version = "0.22.1";
pyproject = true;
format = "setuptools";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jelmer";
repo = "dulwich";
rev = "refs/tags/${pname}-${version}";
hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
hash = "sha256-iP+6KtaQ8tfOobovSLSJZogS/XWW0LuHgE2oV8uQW/8=";
};
build-system = [
@ -39,18 +38,22 @@ buildPythonPackage rec {
setuptools-rust
];
dependencies = [
propagatedBuildInputs = [
certifi
urllib3
];
passthru.optional-dependencies = {
fastimport = [ fastimport ];
fastimport = [
fastimport
];
pgp = [
gpgme
gnupg
];
paramiko = [ paramiko ];
paramiko = [
paramiko
];
};
nativeCheckInputs = [
@ -60,18 +63,31 @@ buildPythonPackage rec {
glibcLocales
pytest-xdist
pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
] ++ passthru.optional-dependencies.fastimport
++ passthru.optional-dependencies.pgp
++ passthru.optional-dependencies.paramiko;
doCheck = !stdenv.isDarwin;
disabledTestPaths = [
# Missing test inputs
"tests/contrib/test_swift_smoke.py"
# Import issue
"tests/test_greenthreads.py"
disabledTests = [
# OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0'
"test_no_decode_encode"
# OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01'
"test_cyrillic"
# OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0'
"test_commit_no_encode_decode"
];
pythonImportsCheck = [ "dulwich" ];
disabledTestPaths = [
# missing test inputs
"dulwich/contrib/test_swift_smoke.py"
# flaky on high core count >4
"dulwich/tests/compat/test_client.py"
];
pythonImportsCheck = [
"dulwich"
];
meta = with lib; {
description = "Implementation of the Git file formats and protocols";
@ -81,10 +97,7 @@ buildPythonPackage rec {
'';
homepage = "https://www.dulwich.io/";
changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${version}/NEWS";
license = with licenses; [
asl20
gpl2Plus
];
license = with licenses; [ asl20 gpl2Plus ];
maintainers = with maintainers; [ koral ];
};
}

View File

@ -58,7 +58,7 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.50.1";
version = "3.50.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -67,7 +67,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc";
rev = "refs/tags/${version}";
hash = "sha256-sY4iU2YdljgpWQXwL8sE424ft0LDjcKf0Q2xZeyv4xs=";
hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0=";
};
pythonRelaxDeps = [

View File

@ -1,39 +1,38 @@
{
lib,
buildPythonPackage,
datasets,
dvc,
dvc-render,
dvc-studio-client,
fastai,
fetchFromGitHub,
funcy,
gto,
jsonargparse,
lightgbm,
lightning,
matplotlib,
mmcv,
numpy,
optuna,
pandas,
pillow,
psutil,
pynvml,
pythonOlder,
ruamel-yaml,
scikit-learn,
scmrepo,
setuptools-scm,
tensorflow,
torch,
transformers,
xgboost,
{ lib
, buildPythonPackage
, datasets
, dvc
, dvc-render
, dvc-studio-client
, fastai
, fetchFromGitHub
, funcy
, gto
, jsonargparse
, lightgbm
, lightning
, matplotlib
, mmcv
, numpy
, optuna
, pandas
, pillow
, psutil
, pynvml
, pythonOlder
, ruamel-yaml
, scikit-learn
, scmrepo
, setuptools-scm
, tensorflow
, torch
, transformers
, xgboost
}:
buildPythonPackage rec {
pname = "dvclive";
version = "3.46.0";
version = "3.45.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -42,10 +41,12 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvclive";
rev = "refs/tags/${version}";
hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk=";
hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI=";
};
build-system = [ setuptools-scm ];
build-system = [
setuptools-scm
];
dependencies = [
dvc
@ -80,17 +81,29 @@ buildPythonPackage rec {
numpy
pillow
];
sklearn = [ scikit-learn ];
sklearn = [
scikit-learn
];
plots = [
pandas
scikit-learn
numpy
];
markdown = [ matplotlib ];
mmcv = [ mmcv ];
tf = [ tensorflow ];
xgb = [ xgboost ];
lgbm = [ lightgbm ];
markdown = [
matplotlib
];
mmcv = [
mmcv
];
tf = [
tensorflow
];
xgb = [
xgboost
];
lgbm = [
lightgbm
];
huggingface = [
datasets
transformers
@ -98,19 +111,25 @@ buildPythonPackage rec {
# catalyst = [
# catalyst
# ];
fastai = [ fastai ];
fastai = [
fastai
];
lightning = [
lightning
torch
jsonargparse
] ++ jsonargparse.optional-dependencies.signatures;
optuna = [ optuna ];
optuna = [
optuna
];
};
# Circular dependency with dvc
doCheck = false;
pythonImportsCheck = [ "dvclive" ];
pythonImportsCheck = [
"dvclive"
];
meta = with lib; {
description = "Library for logging machine learning metrics and other metadata in simple file formats";

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,56 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, rustPlatform
, cmake
, nasm
, substituteAll
}:
buildPythonPackage rec {
pname = "kornia-rs";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "kornia";
repo = "kornia-rs";
rev = "refs/tags/v${version}";
hash = "sha256-7toCMaHzFAzm6gThVLBxKLgQVgFJatdJseDlfdeS8RE=";
};
nativeBuildInputs = [
rustPlatform.maturinBuildHook
rustPlatform.cargoSetupHook
cmake # Only for dependencies.
nasm # Only for dependencies.
];
cargoRoot = "py-kornia";
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
# The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead.
patches = [
(substituteAll {
src = ./kornia-rs-from-crates.patch;
inherit version;
})
];
prePatch = ''
cp ${./Cargo.lock} py-kornia/Cargo.lock
'';
maturinBuildFlags = [ "-m" "py-kornia/Cargo.toml" ];
dontUseCmakeConfigure = true; # We only want to use CMake to build some Rust dependencies.
meta = with lib; {
homepage = "https://github.com/kornia/kornia-rs";
description = "Python bindings to Low-level Computer Vision library in Rust";
license = licenses.asl20;
maintainers = with maintainers; [ chpatrick ];
};
}

View File

@ -0,0 +1,12 @@
diff --git a/py-kornia/Cargo.toml b/py-kornia/Cargo.toml
index e0563f3..e192654 100644
--- a/py-kornia/Cargo.toml
+++ b/py-kornia/Cargo.toml
@@ -9,6 +9,6 @@ crate-type = ["cdylib"]
[dependencies]
anyhow = "1.0.80"
-kornia-rs = { path = ".." }
+kornia-rs = { version = "@version@" }
pyo3 = { version = "0.20", features = ["extension-module"] }
numpy = { version = "0.20.0" }

View File

@ -4,11 +4,12 @@
, pythonOlder
, packaging
, torch
, kornia-rs
}:
buildPythonPackage rec {
pname = "kornia";
version = "0.7.1";
version = "0.7.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,10 +18,11 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gHMrA4Uzazpw4TdswrXdoZG4+ek5g+wtLXNmhH3SlOM=";
hash = "sha256-DmXttvKoLqny0mt3SUonidNxDkNX7N0LdTxy/H32R/4=";
};
propagatedBuildInputs = [
kornia-rs
packaging
torch
];
@ -39,7 +41,6 @@ buildPythonPackage rec {
"kornia.metrics"
"kornia.morphology"
"kornia.tracking"
"kornia.testing"
"kornia.utils"
];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
version = "1.3.0";
version = "1.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "microsoftgraph";
repo = "msgraph-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-RdjACxEB4w1Sbdf8lPHd12XcEMXBqaa84mF9XvavyHo=";
hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M=";
};
build-system = [ setuptools ];

View File

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "openai";
version = "1.23.2";
version = "1.23.6";
pyproject = true;
disabled = pythonOlder "3.7.1";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "refs/tags/v${version}";
hash = "sha256-ScBD+g+xbbZOdIip4ISXYug9MqKLahutUNIoQnD1tHc=";
hash = "sha256-b7LkZc8XGNOG0HHStlFikatKWQ5gob98XLsei/vOq4c=";
};
build-system = [

View File

@ -10,6 +10,7 @@
, pythonOlder
, scipy
, typing-extensions
, setuptools
}:
buildPythonPackage rec {
@ -26,6 +27,10 @@ buildPythonPackage rec {
hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA=";
};
build-system = [
setuptools
];
postPatch = ''
substituteInPlace setup.py \
--replace-fail ', "pytest-cov"' ""

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "recipe-scrapers";
version = "14.55.0";
version = "14.56.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "hhursev";
repo = "recipe-scrapers";
rev = "refs/tags/${version}";
hash = "sha256-HjR4Lwlcrpeqv6BXI+aYCL9e7ZTaTa522z0lSW03wW0=";
hash = "sha256-+9oQLCuR+rRCG5tnyofHd8WMkQ5QPsWfLCnwIDU5d9o=";
};
nativeBuildInputs = [

View File

@ -1,26 +1,25 @@
{
lib,
asyncssh,
buildPythonPackage,
dulwich,
dvc-http,
dvc-objects,
fetchFromGitHub,
fsspec,
funcy,
gitpython,
pathspec,
pygit2,
pygtrie,
pythonOlder,
setuptools,
setuptools-scm,
shortuuid,
{ lib
, asyncssh
, buildPythonPackage
, dulwich
, dvc-http
, dvc-objects
, fetchFromGitHub
, fsspec
, funcy
, gitpython
, pathspec
, pygit2
, pygtrie
, pythonOlder
, setuptools
, setuptools-scm
, shortuuid
}:
buildPythonPackage rec {
pname = "scmrepo";
version = "3.3.2";
version = "3.3.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -29,7 +28,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "scmrepo";
rev = "refs/tags/${version}";
hash = "sha256-8lKiJCvER4Vg6L11WAykmgg37LWiYMsswS38Dtmb2Rc=";
hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE=";
};
build-system = [
@ -54,7 +53,9 @@ buildPythonPackage rec {
# Requires a running Docker instance
doCheck = false;
pythonImportsCheck = [ "scmrepo" ];
pythonImportsCheck = [
"scmrepo"
];
meta = with lib; {
description = "SCM wrapper and fsspec filesystem";

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "snakemake-interface-storage-plugins";
version = "3.2.1";
version = "3.2.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hOZIdYL9YcKmZCTnKA4GbvvvPJ6pUcMLGvU5uYQHokw=";
hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec=";
};
nativeBuildInputs = [

View File

@ -1,5 +1,8 @@
{ lib, buildGoModule, fetchFromGitHub }:
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "go-toml";
version = "2.2.1";
@ -19,13 +22,16 @@ buildGoModule rec {
"cmd/tomltestgen"
];
ldflags = [ "-s" "-w" ];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Go library for the TOML language";
homepage = "https://github.com/pelletier/go-toml";
changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}";
maintainers = [ ];
maintainers = [ maintainers.isabelroses ];
license = licenses.mit;
};
}

View File

@ -1,8 +1,8 @@
{ lib
, fetchFromGitHub
, buildGoModule
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "gotestsum";
version = "1.10.1";
@ -33,6 +33,6 @@ buildGoModule rec {
mainProgram = "gotestsum";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ isabelroses ];
};
}

View File

@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec {
mainProgram = "hydra-cli";
homepage = "https://github.com/nlewo/hydra-cli";
license = with licenses; [ mit ];
maintainers = with maintainers; [ gilligan lewo ];
maintainers = with maintainers; [ lewo ];
};
}

View File

@ -206,7 +206,7 @@ let
homepage = "https://nodejs.org";
changelog = "https://github.com/nodejs/node/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu gilligan cko ];
maintainers = with maintainers; [ goibhniu cko ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "node";
knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";

View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gzdoom";
version = "4.11.3";
version = "4.12.1";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "gzdoom";
rev = "g${version}";
fetchSubmodules = true;
hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748=";
hash = "sha256-ityjfxlazt/R9vD+azVGr+w7Sdjlbh+ekbJexkPSF1g=";
};
outputs = [ "out" "doc" ];

View File

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/nuta/nsh";
changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md";
license = [ licenses.cc0 /* or */ licenses.mit ];
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
};
passthru = {

View File

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/ivanceras/svgbob";
changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md";
license = licenses.asl20;
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "svgbob";
};
}

View File

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
description = "the 'ls' replacement you never knew you needed";
homepage = "https://github.com/willdoescode/nat";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "natls";
};
}

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "sleep with feedback";
homepage = "https://github.com/clamiax/snore";
license = licenses.mit;
maintainers = [ ];
maintainers = with maintainers; [ cafkafk ];
platforms = platforms.unix;
mainProgram = "snore";
};

View File

@ -1,8 +1,8 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "goflow2";
version = "2.1.3";
@ -26,6 +26,6 @@ buildGoModule rec {
description = "High performance sFlow/IPFIX/NetFlow Collector";
homepage = "https://github.com/netsampler/goflow2";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ isabelroses ];
};
}

View File

@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/orf/gping";
changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
mainProgram = "gping";
};
}

View File

@ -19,23 +19,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nzbget";
version = "23.0";
version = "24.0";
src = fetchFromGitHub {
owner = "nzbgetcom";
repo = "nzbget";
rev = "v${finalAttrs.version}";
hash = "sha256-JqC82zpsIqRYB7128gTSOQMWJFR/t63NJXlPgGqP0jE=";
hash = "sha256-vEtbf4y3Jc69FrEzGE34Xt/4oDmZlWTbwispvoypRI0=";
};
patches = [
# add nzbget-ng patch not in nzbgetcom for buffer overflow issue -- see https://github.com/nzbget-ng/nzbget/pull/43
(fetchpatch {
url = "https://github.com/nzbget-ng/nzbget/commit/8fbbbfb40003c6f32379a562ce1d12515e61e93e.patch";
hash = "sha256-mgI/twEoMTFMFGfH1/Jm6mE9u9/CE6RwELCSGx5erUo=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [

View File

@ -10,7 +10,10 @@
stdenv.mkDerivation {
name = "nixos-option";
src = ./.;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.fileFilter (file: file.name != "default.nix") ./.;
};
postInstall = ''
installManPage ${./nixos-option.8}
'';

View File

@ -33,7 +33,7 @@ buildGoModule rec {
homepage = "https://smallstep.com/cli/";
changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ isabelroses ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "step";
};

View File

@ -55,10 +55,11 @@ let
pname = "dell-command-configure-unpacked-wrapper-lib";
inherit version;
src = ./.;
unpackPhase = ''
cp ${./wrapper-lib.c} wrapper-lib.c
'';
postPatch = ''
ls -al
substitute wrapper-lib.c lib.c \
--subst-var-by to "${unpacked}/srvadmin-hapi/opt/dell/srvadmin/etc/omreg.d/omreg-hapi.cfg"
cc -fPIC -shared lib.c -o ${wrapperLibName}

View File

@ -6415,6 +6415,8 @@ self: super: with self; {
kornia = callPackage ../development/python-modules/kornia { };
kornia-rs = callPackage ../development/python-modules/kornia-rs { };
krakenex = callPackage ../development/python-modules/krakenex { };
krfzf-py = callPackage ../development/python-modules/krfzf-py { };