Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-07-28 06:01:00 +00:00 committed by GitHub
commit 384d08d20d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
48 changed files with 244 additions and 217 deletions

View File

@ -29,9 +29,6 @@ let
};
nixosRules = ''
# Miscellaneous devices.
KERNEL=="kvm", MODE="0666"
# Needed for gpm.
SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd"
'';

View File

@ -41,6 +41,8 @@ in
helm-words = callPackage ./manual-packages/helm-words { };
icicles = callPackage ./manual-packages/icicles { };
idris2-mode = callPackage ./manual-packages/idris2-mode { };
isearch-plus = callPackage ./manual-packages/isearch-plus { };

View File

@ -0,0 +1,27 @@
{
lib,
fetchFromGitHub,
melpaBuild,
unstableGitUpdater,
}:
melpaBuild {
pname = "icicles";
version = "0-unstable-2023-07-27";
src = fetchFromGitHub {
owner = "emacsmirror";
repo = "icicles";
rev = "dfc1d9caf1b5156567292c9548547a2975a841bc";
hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI=";
};
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
meta = {
homepage = "https://emacswiki.org/emacs/Icicles";
description = "Emacs library that enhances minibuffer completion";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.8.3381.46";
version = "6.8.3381.48";
suffix = {
aarch64-linux = "arm64";
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-OR79+Y2z9b8aE5WecIlbJsJx6wdMDnlWjCE9HYmOfn0=";
x86_64-linux = "sha256-F8HibI1fWI0nPWaXDNgrSHcp2iTuC9LZhble877zrMg=";
aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo=";
x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View File

@ -21,14 +21,14 @@
mkDerivation rec {
pname = "kaidan";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM=";
hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

View File

@ -22,16 +22,16 @@ let
in
buildGoModule rec {
pname = "gotenberg";
version = "8.8.0";
version = "8.8.1";
src = fetchFromGitHub {
owner = "gotenberg";
repo = "gotenberg";
rev = "refs/tags/v${version}";
hash = "sha256-OHvtdUFZYm+I8DN8lAdlNAIRLWNRC/GbVEueRfyrwDA=";
hash = "sha256-vXrSPu/iY6JsOvPKDRdg6TnUjNV7X5GEb5l9bk4lSpY=";
};
vendorHash = "sha256-w9Q3hK8d5NwDYp8kydrWrlBlOmMyDqDixdv3z79yhK8=";
vendorHash = "sha256-Hxava/dRQ2TFWrg7fIvRkp3NW61QWmWNEQiBP71wlR8=";
postPatch = ''
find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \;

View File

@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "nezha-agent";
version = "0.18.0";
version = "0.18.5";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "agent";
rev = "refs/tags/v${version}";
hash = "sha256-Y7wuZmFc1ztofbfjmoAKZv9U05RbINYTyoNDHXKORYY=";
hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk=";
};
vendorHash = "sha256-M928t59dP5xqMZ+EzyFrzW0fYWuebk1V7UajI7g4VKg=";
vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs=";
ldflags = [
"-s"

View File

@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "pupdate";
version = "3.10.3";
version = "3.11.0";
src = fetchFromGitHub {
owner = "mattpannella";
repo = "${pname}";
rev = "${version}";
hash = "sha256-xaoOfylDf8KBGjS5RxPH156PRfEBFk+sRZ4QTCMSQbY=";
hash = "sha256-SqEmpmjI0m6bJT43TLEmEciNEqR/ggQZqFLCm7oFSnY=";
};
buildInputs = [

View File

@ -0,0 +1,28 @@
diff --git a/Cargo.lock b/Cargo.lock
index e4e2d1a..72839b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -198,9 +198,9 @@ dependencies = [
[[package]]
name = "bitstream-io"
-version = "2.5.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
[[package]]
name = "built"
@@ -1376,9 +1376,9 @@ dependencies = [
[[package]]
name = "ravif"
-version = "0.11.8"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
dependencies = [
"avif-serialize",
"imgref",

View File

@ -0,0 +1,57 @@
{
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch,
pkg-config,
cmake,
}:
rustPlatform.buildRustPackage rec {
pname = "rmpc";
version = "0.2.1";
src = fetchFromGitHub {
owner = "mierak";
repo = "rmpc";
rev = "v${version}";
hash = "sha256-g+yzW0DfaBhJKTikYZ8eqe4pX8nJvbpJ1xaZ3W/O/bo=";
};
cargoHash = "sha256-wFrHgB4wYGeXvfdGf4SJAAL8fE6dAKDLL51Ohmn+1HQ=";
cargoPatches = [
# Patch Cargo.lock to make rmpc compile with older versions of rustc
# Remove when Rust 1.79.0 is in master
./Cargo.lock.patch
];
patches = [
# Fix release mode tests compilation issues
# Remove when next rmpc version comes out
(fetchpatch {
url = "https://github.com/mierak/rmpc/commit/f12be6f606f5319523f41576e7c463b6008b9069.patch";
hash = "sha256-4L/MrdC/ydTqnkt3qd5H8hLZimiqct6sOkEq8rJN0F4=";
})
];
nativeBuildInputs = [
pkg-config
cmake
];
meta = {
changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}";
description = "TUI music player client for MPD with album art support via kitty image protocol";
homepage = "https://mierak.github.io/rmpc/";
license = lib.licenses.bsd3;
longDescription = ''
Rusty Music Player Client is a beautiful, modern and configurable terminal-based Music Player
Daemon client. It was inspired by ncmpcpp and aims to provide an alternative with support for
album art through kitty image protocol without any ugly hacks. It also features ranger/lf
inspired browsing of songs and other goodies.
'';
maintainers = with lib.maintainers; [ donovanglover ];
mainProgram = "rmpc";
};
}

View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic";
version = "1.0.15";
version = "1.0.16";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-jN50v0N7wSL/F6qOSjp+nRmooR/mNiebsbe4Iy5YmeM=";
hash = "sha256-DivT1OEbjZQAV6anWzrYpgzQoYFFPFZAM33TdITZHAg=";
};
sourceRoot = ".";

View File

@ -1,29 +1,29 @@
{ lib
, fetchFromGitHub
, smassh
, python3
, testers
{
lib,
fetchFromGitHub,
smassh,
python311,
testers,
}:
let
python3 = python311;
in
python3.pkgs.buildPythonApplication rec {
pname = "smassh";
version = "3.1.3";
version = "3.1.4";
pyproject = true;
src = fetchFromGitHub {
owner = "kraanzu";
repo = "smassh";
rev = "v${version}";
hash = "sha256-QE7TFf/5hdd2W2EsVbn3gV/FundhJNxHqv0JWV5dYDc=";
hash = "sha256-MeLub6zeviY7yyPP2FI9b37nUwHZbxW6onuFXSkmvqk";
};
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
nativeBuildInputs = with python3.pkgs; [ poetry-core ];
pythonRelaxDeps = [
"textual"
];
pythonRelaxDeps = [ "textual" ];
propagatedBuildInputs = with python3.pkgs; [
textual

View File

@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
meta = with lib;{
# Low maintenance mode, doesn't support up-to-date faiss
# https://github.com/NixOS/nixpkgs/pull/330191#issuecomment-2252965866
broken = lib.versionAtLeast faiss.version "1.8.0";
description = "SQLite extension for efficient vector search based on Faiss";
homepage = "https://github.com/asg017/sqlite-vss";
changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}";

View File

@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tabiew";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "shshemi";
repo = "tabiew";
rev = "v${version}";
hash = "sha256-Sui2UX2EWXgtkU83tb2QP0EQCImAvWrR2dYkfXjqDdc=";
hash = "sha256-WnIlGWfIoCq9jrMG9SI3zYFs6ItjrMFF6KiNYkiA9Ag=";
};
cargoHash = "sha256-QEuO5Jtv9xw9W2jI2g3pJENi/CQcFsC3PCc63v2Cd40=";
cargoHash = "sha256-lB6EaJnPoUxB+cs6rmiiOmgoOo+kzETRwKWbtsik42A=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zig-shell-completions";
version = "0-unstable-2023-11-18";
version = "0-unstable-2024-07-08";
src = fetchFromGitHub {
owner = "ziglang";
repo = "shell-completions";
rev = "31d3ad12890371bf467ef7143f5c2f31cfa7b7c1";
hash = "sha256-ID/K0vdg7BTKGgozISk/X4RBxCVfhSkVD6GSZUoP9Ls=";
rev = "8d3db71e9a0497de98946b2ca2ee7e87d106607e";
hash = "sha256-iil6M59S94f9SojTnwdWGOlIO/QOV77fJOUjyBa7jMk=";
};
nativeBuildInputs = [ installShellFiles ];

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "deepin-terminal";
version = "6.0.12";
version = "6.0.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-VAF6Dn9cGmipQhAKhEOLd7lJyYWySOJ+rehc9L8pfL0=";
hash = "sha256-7+NJyqOp+9CHqdpBKx91RQNk1Z8vMQQqZcyKC5RSDjg=";
};
cmakeFlags = [ "-DVERSION=${version}" ];

View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "deepin-icon-theme";
version = "2024.04.16";
version = "2024.07.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-IUiKGHsFGJawWnwfckS8ZeB2WOxDyDlre4oekJuCKcc=";
hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

View File

@ -279,6 +279,7 @@ let
license = licenses.ruby;
maintainers = with maintainers; [ manveru ];
platforms = platforms.all;
mainProgram = "ruby";
knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/.";
};

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ayatana-ido";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = pname;
rev = version;
sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA=";
sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs=";
};
nativeBuildInputs = [ pkg-config cmake ];

View File

@ -1,7 +1,6 @@
{ lib
, config
, fetchFromGitHub
, fetchpatch2
, stdenv
, cmake
, cudaPackages ? { }
@ -26,7 +25,7 @@
let
pname = "faiss";
version = "1.7.4";
version = "1.8.0";
inherit (cudaPackages) flags backendStdenv;
@ -51,18 +50,9 @@ stdenv.mkDerivation {
owner = "facebookresearch";
repo = pname;
rev = "v${version}";
hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";
hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I=";
};
patches = [
(fetchpatch2 {
# Replace distutils with packaging for version checks
url = "https://github.com/facebookresearch/faiss/commit/c540e762ca0ecf8f43da0bfc215da148c5cf420e.patch";
includes = [ "faiss/python/loader.py" ];
hash = "sha256-yMHAXo0+oDXknSpv1fxUgil3R/WG1+vTLyxvwVR3VtE=";
})
];
postPatch = ''
# Remove the following substituteInPlace when updating
# to a release that contains change from PR
@ -107,12 +97,14 @@ stdenv.mkDerivation {
"-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}"
];
buildFlags = [
"faiss"
"demo_ivfpq_indexing"
] ++ lib.optionals pythonSupport [
"swigfaiss"
];
buildFlags =
[ "faiss" ]
# This is just a demo app used as a test.
# Disabled because linkage fails:
# https://github.com/facebookresearch/faiss/issues/3484
++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ]
++ lib.optionals pythonSupport [ "swigfaiss" ];
# pip wheel->pip install commands copied over from opencv4
@ -123,7 +115,9 @@ stdenv.mkDerivation {
postInstall = ''
mkdir -p $demos/bin
cp ./demos/demo_ivfpq_indexing $demos/bin/
if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then
cp ./demos/demo_ivfpq_indexing $demos/bin/
fi
'' + lib.optionalString pythonSupport ''
mkdir -p $out/${pythonPackages.python.sitePackages}
(cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache)

View File

@ -16,7 +16,7 @@ buildPythonPackage rec {
version = "0.7.3";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "miaucl";

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "django-ninja";
version = "1.2.1";
version = "1.2.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "vitalik";
repo = "django-ninja";
rev = "refs/tags/v${version}";
hash = "sha256-43yLhiDpksTPNh9Q8T8rSBzaZ99XCXIrNkTSdWk0gLc=";
hash = "sha256-wD2ZizvMEY9oDQZTr4KzbNY5sStf7lCyPPJBoaa4trU=";
};
propagatedBuildInputs = [

View File

@ -39,14 +39,14 @@ assert cudaSupport -> gpuSupport != true;
buildPythonPackage rec {
pname = "lightgbm";
version = "4.4.0";
version = "4.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nop2QJEUgRNOYJh9XR4c0Vf0MMO0s43o02/FXDArwpk=";
hash = "sha256-4c17rwMY1OMIomV1pjpGNfCN+GatNiKp2OPXHZY3obo=";
};
nativeBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mdformat-mkdocs";
version = "2.1.1";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "KyleKing";
repo = "mdformat-mkdocs";
rev = "refs/tags/v${version}";
hash = "sha256-hBkHVYlcHCXfE8Z2gLv6Rt0tQSkx2LYqbEtCncDByrI=";
hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE=";
};
nativeBuildInputs = [ flit-core ];

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "opower";
version = "0.5.2";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
hash = "sha256-aK/zpeSe9GBONDbFqLF6ZGkBkhp2/GzH5gg3hfJcl/U=";
hash = "sha256-juN9o1RPLDALND1po5S4WNMDkOWnr4hl38yxWnsoupg=";
};
build-system = [ setuptools ];

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "oracledb";
version = "2.2.1";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hGTG8ClfMxja9sLHLIPC3Lw34T+P1E4+Of+GZfRC1rY=";
hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U=";
};
build-system = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pdoc";
version = "14.5.1";
version = "14.6.0";
disabled = pythonOlder "3.8";
pyproject = true;
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "mitmproxy";
repo = "pdoc";
rev = "v${version}";
hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc=";
hash = "sha256-kQBW8bN8WYvWzpqM6JatB3bB/bAQqpHGd98prznyO+g=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -2,7 +2,9 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
jedi,
packaging,
pygments,
urwid,
urwid-readline,
@ -13,18 +15,21 @@
buildPythonPackage rec {
pname = "pudb";
version = "2024.1.1";
format = "setuptools";
version = "2024.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-/19TleNqGaZfIvUi/WAn0no2q3g95FEbQckUhKthSXU=";
hash = "sha256-rcmwAEK6g2cRffCmwNxi+pYJq9IcO/jltz1iCQfFtD4=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
jedi
packaging
pygments
urwid
urwid-readline

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "6.41.0";
version = "6.46.0";
pyproject = true;
build-system = [ setuptools ];
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-7l+m4ULDGa15QNu6l2kURQznKP2Ut9Y1P9njV7s9nzc=";
hash = "sha256-TxtvvkZULEDhxodUyc+T6Xo3i8qwOEE7Mh8Wh0WMJTA=";
};
sourceRoot = "${src.name}/sdk/python";

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "pytelegrambotapi";
version = "4.20.0";
version = "4.21.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "eternnoir";
repo = "pyTelegramBotAPI";
rev = "refs/tags/${version}";
hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8=";
hash = "sha256-e0cyxwofixdtv3qNEAnb+dG2ya8wUqKmIx3hRGkFrpE=";
};
build-system = [ hatchling ];

View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "reproject";
version = "0.13.1";
version = "0.14.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-Y+Ne7ZUgCieWcC4zqfrqPzmr/kGUdFroGfIPKWACaPY=";
hash = "sha256-3TxPd2CEmKWDlE1nC2GnXBUASe/DNgZnS1GJoRo5u8A=";
};
postPatch = ''

View File

@ -5,33 +5,35 @@
commoncode,
fetchPypi,
packaging,
pyparsing,
pytestCheckHook,
pythonOlder,
saneyaml,
semantic-version,
semver,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "univers";
version = "30.11.0";
format = "setuptools";
version = "30.12.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U=";
hash = "sha256-NbsoYfTk5SWyUQZnOdm+ZCXK7wD+DV/updRHqHoU49c=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dependencies = [
attrs
packaging
pyparsing
semantic-version
semver
];

View File

@ -1,91 +0,0 @@
{
lib,
babel,
buildPythonPackage,
cssselect,
feedparser,
fetchPypi,
gdata,
gnupg,
google-api-python-client,
html2text,
libyaml,
lxml,
mechanize,
nose,
pdfminer-six,
pillow,
prettytable,
pyqt5,
python-dateutil,
pythonOlder,
pyyaml,
requests,
simplejson,
termcolor,
unidecode,
}:
buildPythonPackage rec {
pname = "weboob";
version = "2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw";
};
nativeBuildInputs = [ pyqt5 ];
propagatedBuildInputs = [
babel
cssselect
python-dateutil
feedparser
gdata
gnupg
google-api-python-client
html2text
libyaml
lxml
mechanize
pdfminer-six
pillow
prettytable
pyqt5
pyyaml
requests
simplejson
termcolor
unidecode
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "with-doctest = 1" "" \
--replace "with-coverage = 1" "" \
--replace "weboob.browser.filters.standard," "" \
--replace "weboob.browser.tests.filters," "" \
--replace "weboob.tools.application.formatters.json," "" \
--replace "weboob.tools.application.formatters.table," "" \
--replace "weboob.tools.capabilities.bank.transactions," ""
'';
nativeCheckInputs = [ nose ];
checkPhase = ''
nosetests
'';
pythonImportsCheck = [ "weboob" ];
meta = with lib; {
description = "Collection of applications and APIs to interact with websites";
homepage = "http://weboob.org";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ ];
};
}

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "whool";
version = "1.0.1";
version = "1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "sbidoul";
repo = "whool";
rev = "refs/tags/v${version}";
hash = "sha256-skJoMDIgZgRjfp4tsc6TKYVe09XBvg8Fk2BQfqneCYI=";
hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc=";
};
build-system = [ hatch-vcs ];

View File

@ -16,22 +16,24 @@
nlohmann_json,
pkg-config,
testers,
python3,
}:
let
common = rec {
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixd";
rev = version;
hash = "sha256-1i4U012vqw84NuD5cjgfVX/he4vW9MyEeIetJ55g280=";
hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E=";
};
nativeBuildInputs = [
meson
ninja
python3
pkg-config
];
@ -49,6 +51,7 @@ let
inclyc
Ruixi-rebirth
aleksana
redyf
];
platforms = lib.platforms.unix;
};

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.23.2";
version = "1.23.5";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-DheAS9HHzhmg6J6qBF81uaTmlGNS2igcxuc3ic3nFr0=";
hash = "sha256-rSMMzDf0GVUoyoYt++a2khjC4lcR3jvoLJRq8tk+UAE=";
};
cargoHash = "sha256-VEBwVs1UJFRsoyHHcKQaUpKna5XvAG7vzoWaS7c8ycU=";
cargoHash = "sha256-faQfKbBKr8WRCXZpGy+uCbKdMp4FDFwYcsryNls+IRw=";
meta = with lib; {
description = "Source code spell checker";

View File

@ -56,7 +56,7 @@
"version": "1.20.6-148"
},
"1.21": {
"hash": "sha256-rODj39/o2jGuZ92533ewLlCBbwy35s/r+biHS6fxDTU=",
"version": "1.21-62"
"hash": "sha256-+WMhuewhpGB/JbVFhZAy+5HmIWwIbbY9fOOD/5oghco=",
"version": "1.21-108"
}
}

View File

@ -13,13 +13,13 @@ let
yquake2 = stdenv.mkDerivation rec {
pname = "yquake2";
version = "8.30";
version = "8.40";
src = fetchFromGitHub {
owner = "yquake2";
repo = "yquake2";
rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE=";
sha256 = "sha256-licz659DFS56/5P/hmPSE0YuVPTp1r4yrzS7FIg4Okc=";
};
postPatch = ''

View File

@ -59,13 +59,13 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend =
stdenv.mkDerivation rec {
pname = "esdm";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "smuellerDD";
repo = "esdm";
rev = "v${version}";
sha256 = "sha256-UH6ws/hfHdcmbLETyZ0b4wDm8nHPdLsot3ZhIljpUlw=";
hash = "sha256-Z8cIjNI+Qi6O2e72vbEefbCCXyIA+lcEMDzWJReGrUs=";
};
nativeBuildInputs = [ meson pkg-config ninja ];

View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "6.9.8"; #zen
version = "6.10.1"; #zen
suffix = "zen1"; #zen
sha256 = "1ixrdx2a6jp1x8kryjmxnrgl0fsrjg6fngg5c48vbl2574nizlbz"; #zen
sha256 = "0lr9qjz4hlvx3yc0lj65fnmbciyh6symycbi9ass761l1niswbk5"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.9.8"; #lqx
version = "6.9.11"; #lqx
suffix = "lqx1"; #lqx
sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx
sha256 = "0i6i0ak10gswlk60pnkn5dlz74g4nd7n1xbnvf24nnwwp69kkd44"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "psftools";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz";
sha256 = "sha256-MecY4JsIXTgHdkrFkQ+C3fC6OEFRUgjUgf7qxfKeZtM=";
sha256 = "sha256-d/XlKPqYy9x8KNT+8G6zv9ST/uU53Tg4pYrlA17Jh94=";
};
outputs = ["out" "man" "dev" "lib"];

View File

@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-MlnT16a2l209uqu9DuXLwqf4yiWBn9MggqVubzg0pM4=";
arm64-linux_hash = "sha256-2NkklAOjpDbAXid+rayiQ+jndLluIAMEiKz0MA1Hg0k=";
x64-osx_hash = "sha256-OzUZsXUwE7jF4h/rCvWAY5mh97z/cUbhh6MK0ozHC+A=";
arm64-osx_hash = "sha256-ggNqWCixkHxhiWTYfUx9qeZ9ocTyJEEgSZJqgGOnL+Q=";
x64-linux_hash = "sha256-2UkdzOvJZ7fWag/kyfFffPtCVEXil0TTcTReykPKWuU=";
arm64-linux_hash = "sha256-IuLtPWsUukiIk9H/0yf74SipYcbvn1p5MZUbptypCJs=";
x64-osx_hash = "sha256-vLkY9rqdQwr/ntpmUMK5bCIjLWGCt1xEhH/QQzgkZV8=";
arm64-osx_hash = "sha256-Y0aXaMnOCdzrIiM7BqGdHAIO60VFNWUb5ISGaVDX/9s=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "5.7.0.8882";
version = "5.8.3.8933";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

View File

@ -130,7 +130,7 @@ stageFuns: let
# code here, we'll cause an infinite recursion. Since a set with
# clang as its default compiler always means libc++, we can infer this
# decision statically.
then buildPackages.llvmPackages.libcxxClang
then buildPackages.pkgsBuildTarget.llvmPackages.libcxxClang
else buildPackages.gcc
else
# This will blow up if anything uses it, but that's OK. The `if

View File

@ -49,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ rob anthonyroussel ];
mainProgram = "cowsay";
};
})

View File

@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ ramkromberg sternenseemann ];
mainProgram = "man";
};
}

View File

@ -18,19 +18,17 @@ in
openssh_hpn = common rec {
pname = "openssh-with-hpn";
version = "9.7p1";
version = "9.8p1";
extraDesc = " with high performance networking patches";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0=";
hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM=";
};
extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in
extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/402562e2559e198c6660171dec58e7a25cc14ec2/security/openssh-portable/files/extra-patch-hpn"; in
[
./ssh-keysign-8.5.patch
./openssh-9.6_p1-CVE-2024-6387.patch
./openssh-9.6_p1-chaff-logic.patch
# HPN Patch from FreeBSD ports
(fetchpatch {
@ -38,7 +36,7 @@ in
inherit url;
stripLen = 1;
excludes = [ "channels.c" ];
hash = "sha256-MydulQvz8sDVQ6Up9U1yrsiyI5EGmyKl/stUk7DvVOU=";
hash = "sha256-CZ35dQpanzt0Uoo/2sDET5J/hYRF8ofiAz60HlAsCV8=";
})
(fetchpatch {

View File

@ -609,6 +609,7 @@ mapAliases ({
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
weboob = throw "weboob has been removed, please use woob instead"; # added 2024-07-27
websocket_client = websocket-client; # added 2021-06-15
word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19

View File

@ -17264,8 +17264,6 @@ self: super: with self; {
webob = callPackage ../development/python-modules/webob { };
weboob = callPackage ../development/python-modules/weboob { };
webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { };
webrtcvad = callPackage ../development/python-modules/webrtcvad { };