Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-07-20 00:20:12 +00:00
committed by GitHub
46 changed files with 399 additions and 190 deletions
+1 -1
View File
@@ -535,7 +535,7 @@ let
name = mkDefault name;
members = mapAttrsToList (n: u: u.name) (
filterAttrs (n: u: elem config.name u.extraGroups) cfg.users
filterAttrs (n: u: u.enable && elem config.name u.extraGroups) cfg.users
);
};
@@ -8,12 +8,12 @@
gitMinimal,
}:
let
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
tag = "v${version}";
hash = "sha256-R95i3dDVBfH0oxTdK0F0ami0SAk0VVONXIlX6ZF0kmk=";
hash = "sha256-iWM+/lq4HG4Cm+f8JkLee34hnC9119znBOFDXC1Fow0=";
};
blink-fuzzy-lib = rustPlatform.buildRustPackage {
inherit version src;
+42 -28
View File
@@ -1,25 +1,49 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
copyPkgconfigItems,
makePkgconfigItem,
picosat,
}:
stdenv.mkDerivation rec {
pname = "aiger";
version = "1.9.9";
version = "1.9.20";
src = fetchurl {
url = "https://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "aiger";
tag = "rel-${version}";
hash = "sha256-ggkxITuD8phq3VF6tGc/JWQGBhTfPxBdnRobKswYVa4=";
};
patches = [
# Fix implicit declaration of `isatty`, which is an error with newer versions of clang.
./fix-missing-header.patch
enableParallelBuilding = true;
nativeBuildInputs = [ copyPkgconfigItems ];
pkgconfigItems = [
(makePkgconfigItem {
name = "aiger";
inherit version;
cflags = [ "-I\${includedir}" ];
libs = [
"-L\${libdir}"
"-laiger"
];
variables = {
includedir = "@includedir@";
libdir = "@libdir@";
};
inherit (meta) description;
})
];
enableParallelBuilding = true;
env = {
# copyPkgconfigItems will substitute these in the pkg-config file
includedir = "${placeholder "dev"}/include";
libdir = "${placeholder "lib"}/lib";
};
configurePhase = ''
# Set up picosat, so we can build 'aigbmc'
@@ -30,27 +54,17 @@ stdenv.mkDerivation rec {
./configure.sh
'';
installPhase = ''
mkdir -p $out/bin $dev/include $lib/lib
postBuild = ''
$AR rcs libaiger.a aiger.o
'';
# Do the installation manually, as the Makefile has odd
# cyrillic characters, and this is easier than adding
# a whole .patch file.
BINS=( \
aigand aigdd aigflip aigfuzz aiginfo aigjoin \
aigmiter aigmove aignm aigor aigreset aigsim \
aigsplit aigstrip aigtoaig aigtoblif aigtocnf \
aigtodot aigtosmv aigunconstraint aigunroll \
andtoaig bliftoaig smvtoaig soltostim wrapstim \
aigbmc aigdep
)
installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
# test that installing picosat in configurePhase suceeded
test -f $out/bin/aigbmc
for x in ''${BINS[*]}; do
install -m 755 -s $x $out/bin/$x
done
cp -v aiger.o $lib/lib
cp -v aiger.h $dev/include
install -m 444 -Dt $lib/lib libaiger.a
install -m 444 -Dt $dev/include aiger.h
'';
outputs = [
@@ -0,0 +1,60 @@
From c48f5d57b6e57f42b668c0c6b8744e4620c77320 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Tue, 19 Nov 2024 20:47:27 +0100
Subject: [PATCH] Use magick command from ImageMagick
With ImageMagick version 7 the convert command has been deprecated in
favour of magick. Calling convert instead results in the logs being
spammed with warning messages.
The mogrify Elixir wrapper also runs magick with the mogrify argument
in current releases.
---
lib/pleroma/application_requirements.ex | 8 ++++----
lib/pleroma/helpers/media_helper.ex | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex
index c3777d8f1..55ee674a2 100644
--- a/lib/pleroma/application_requirements.ex
+++ b/lib/pleroma/application_requirements.ex
@@ -166,10 +166,10 @@ defp check_system_commands!(:ok) do
filter_commands_statuses = [
check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
- check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
- check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),
- check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),
- check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"),
+ check_filter(Pleroma.Upload.Filter.Mogrify, "magick"),
+ check_filter(Pleroma.Upload.Filter.Mogrifun, "magick"),
+ check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
+ check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe")
]
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
index cb95d0e68..17cd9629d 100644
--- a/lib/pleroma/helpers/media_helper.ex
+++ b/lib/pleroma/helpers/media_helper.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Helpers.MediaHelper do
require Logger
def missing_dependencies do
- Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
+ Enum.reduce([imagemagick: "magick", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
if Pleroma.Utils.command_available?(executable) do
acc
else
@@ -22,7 +22,7 @@ def missing_dependencies do
end
def image_resize(url, options) do
- with executable when is_binary(executable) <- System.find_executable("convert"),
+ with executable when is_binary(executable) <- System.find_executable("magick"),
{:ok, args} <- prepare_image_resize_args(options),
{:ok, env} <- HTTP.get(url, [], []),
{:ok, fifo_path} <- mkfifo() do
--
2.43.0
+10
View File
@@ -23,6 +23,16 @@ beamPackages.mixRelease rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ file ];
patches = [
# See <https://akkoma.dev/AkkomaGang/akkoma/pulls/854>
# Akkoma uses the deprecated “convert” command instead of “magick”, which
# results in the logs being spammed with warning messages. Upstream is
# reluctant to change this, to ensure compatibility with Debian stable,
# which does not yet provide ImageMagick 7.
# Remove this patch once merged upstream.
./akkoma-imagemagick.patch
];
mixFodDeps = beamPackages.fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version;
+10 -9
View File
@@ -2,18 +2,19 @@
lib,
fetchFromGitHub,
python3,
versionCheckHook,
}:
python3.pkgs.buildPythonApplication rec {
pname = "arsenal";
version = "1.1.0";
format = "pyproject";
version = "1.2.7";
pyproject = true;
src = fetchFromGitHub {
owner = "Orange-Cyberdefense";
repo = "arsenal";
rev = version;
sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA=";
tag = version;
sha256 = "sha256-C8DEB/xojU7vGvmeBF+PBD6KWMaJgwa7PpRS5+YzQ6c=";
};
build-system = with python3.pkgs; [
@@ -28,18 +29,18 @@ python3.pkgs.buildPythonApplication rec {
pyyaml
];
# Project has no tests
doCheck = false;
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
pythonImportsCheck = [
"arsenal"
];
meta = with lib; {
meta = {
description = "Tool to generate commands for security and network tools";
homepage = "https://github.com/Orange-Cyberdefense/arsenal";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
license = with lib.licenses; [ gpl3Only ];
maintainers = with lib.maintainers; [ fab ];
mainProgram = "arsenal";
};
}
+1 -1
View File
@@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"[0-9.]+"
"v([0-9.]+)"
];
};
+5 -2
View File
@@ -16,17 +16,18 @@
zlib,
pkg-config,
cmake,
aiger,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bitwuzla";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = finalAttrs.version;
hash = "sha256-S8CtK8WEehUdOoqOmu5KnoqHFpCGrYWjZKv1st4M7bo=";
hash = "sha256-4Gf06aZ3iBEu0bNZAGgWCXVgKA0ew37Zf6XArnlVAXw=";
};
strictDeps = true;
@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
gmp
zlib
kissat
aiger
];
mesonFlags = [
@@ -55,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Ddefault_library=shared"
"-Dcryptominisat=true"
"-Dkissat=true"
"-Daiger=true"
(lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck)
];
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.62.1";
version = "11.63.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-j31vx0ciyursGB9Ty0AStCbgSCBTyRkPPhCOiF+aTxs=";
hash = "sha256-o5JqWPI4S1ic/L1A/AXl32g3RTmcxoR+Cmx2dxJoorA=";
};
proxyVendor = true;
vendorHash = "sha256-qca0zdPkRQD+9QA6uz3Kl7UfVii+QOwlyz+SnORXd18=";
vendorHash = "sha256-FOT30kp15TRvnziBis3n9CvBfzgUEKCLAU+gCSH3vA8=";
subPackages = [ "apps/cnspec" ];
+4 -4
View File
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
# doesn't handle real build products very well (it works on a build-time
# dir, not installed copy)... This is so we can build 'blimc'
substituteInPlace ./makefile \
--replace 'targets: liblgl.a' 'targets: liblgl.a blimc' \
--replace '$(AIGER)/aiger.o' '${aiger.lib}/lib/aiger.o' \
--replace '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \
--replace '-I$(AIGER)' '-I${aiger.dev}/include'
--replace-fail 'targets: liblgl.a' 'targets: liblgl.a blimc' \
--replace-fail '$(AIGER)/aiger.o' '${aiger.lib}/lib/libaiger.a' \
--replace-fail '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \
--replace-fail '-I$(AIGER)' '-I${aiger.dev}/include'
'';
installPhase = ''
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "norminette";
version = "3.3.58";
version = "3.3.59";
pyproject = true;
src = fetchFromGitHub {
owner = "42School";
repo = "norminette";
tag = version;
hash = "sha256-6hBBbfW2PQFb8rcDihvtWK0df7WcvOk0il1E82GOxaU=";
hash = "sha256-XPaMQCziL9/h+AHx6I6MIRAlzscWvOTkxUP9dMI4y0o=";
};
build-system = with python3Packages; [
+10 -2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
autoreconfHook,
check,
flex,
@@ -16,15 +17,22 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.16.2";
version = "1.17.0";
src = fetchFromGitHub {
owner = "nickg";
repo = "nvc";
tag = "r${version}";
hash = "sha256-A7NrYHX46vx9mD/J02cl0MMCTlgW/MjRFcXwuFPK9E8=";
hash = "sha256-W6TCtd6LJwjM/kPBqEiPM2xcWn8OzEjCx4llUR/6K78=";
};
patches = [
(fetchpatch2 {
url = "https://github.com/nickg/nvc/commit/4a94efdb8f314732d59368ade364d2e03b424e14.patch?full_index=1";
hash = "sha256-faL+/CtqgLitHAol7JYW0dxOXZrm3dwVwiZ8FGPEhgg=";
})
];
nativeBuildInputs = [
autoreconfHook
check
@@ -1,20 +1,12 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
fleep,
ifaddr,
libarchive-c,
pillow,
requests-toolbelt,
setuptools,
zeroconf,
pytestCheckHook,
writableTmpDirAsHomeHook,
openssl,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "opendrop";
version = "0.13.0";
format = "setuptools";
@@ -22,7 +14,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "seemoo-lab";
repo = "opendrop";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-4FeVQO7Z6t9mjIgesdjKx4Mi+Ro5EVGJpEFjCvB2SlA=";
};
@@ -31,7 +23,7 @@ buildPythonApplication rec {
openssl
];
propagatedBuildInputs = [
dependencies = with python3Packages; [
fleep
ifaddr
libarchive-c
@@ -45,18 +37,18 @@ buildPythonApplication rec {
"--prefix PATH : ${lib.makeBinPath nativeBuildInputs}"
];
checkInputs = [
checkInputs = with python3Packages; [
pytestCheckHook
];
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
meta = with lib; {
meta = {
description = "Open Apple AirDrop implementation written in Python";
homepage = "https://owlink.org/";
changelog = "https://github.com/seemoo-lab/opendrop/releases/tag/${src.rev}";
license = licenses.gpl3Only;
maintainers = [ ];
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ];
mainProgram = "opendrop";
platforms = [ "x86_64-linux" ];
};
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-9";
version = "GE-Proton10-10";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-DJ7bRjzJehSFIyBo+oJyyWui+a3udGxc38P9Hw+xU9U=";
hash = "sha256-TJbeyJA9feyaBIYt5hwVUAAdev0SnoIqvhV7groxcu4=";
};
dontUnpack = true;
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-pass";
version = "1.32.0";
version = "1.32.2";
src = fetchurl {
url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
hash = "sha256-b45u7S9syw9KvCthQlNKzUusPKSBDnY4k6pC6H4TcnU=";
hash = "sha256-j/25TaZKvMFIB18InRD1kknwXNmHxUpl6xU3WdrvRrk=";
};
dontConfigure = true;
+5
View File
@@ -7,6 +7,7 @@
pkg-config,
gtk3,
alsa-lib,
gettext,
}:
stdenv.mkDerivation rec {
@@ -31,6 +32,10 @@ stdenv.mkDerivation rec {
alsa-lib
];
# Work around regressions introduced by bad interaction between
# gettext >= 0.25 and autoconf (2.72 at the time of writing).
env.ACLOCAL = "aclocal -I ${gettext}/share/gettext/m4";
meta = with lib; {
description = "Lightweight volume control that sits in your systray";
homepage = "https://nullwise.com/pages/volumeicon/volumeicon.html";
+3 -3
View File
@@ -6,7 +6,7 @@
nix-update-script,
}:
let
version = "2.14.0";
version = "2.14.1";
in
buildGoModule {
pname = "wakapi";
@@ -16,10 +16,10 @@ buildGoModule {
owner = "muety";
repo = "wakapi";
tag = version;
hash = "sha256-7+T4jAZHgGFggTg3Teq0apQWIyJi3llEeLhO0igpcWY=";
hash = "sha256-ujHrb9yXUbUYB0JGftrdTfEeFakgwGJ7EH6e1KnyrnI=";
};
vendorHash = "sha256-rjkFd31BS1ujD8K9s48Fm6Ok3Xbnm5uvlBTtYL0S4Gg=";
vendorHash = "sha256-eaaU8vqTpgtSSfaaFDg4Bo06lTjvqLkVuidkq25tjb4=";
# Not a go module required by the project, contains development utilities
excludedPackages = [ "scripts" ];
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zashboard";
version = "1.96.0";
version = "1.99.0";
src = fetchFromGitHub {
owner = "Zephyruso";
repo = "zashboard";
tag = "v${finalAttrs.version}";
hash = "sha256-3sY3C4iNqVPhbwWCzGRRJ9pDfewPq7q70kMrXuqZQpc=";
hash = "sha256-xCyPKCfALCogmkXCFV79nKcFPp4SixmuZWIdKmXxHmY=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "zlint";
version = "3.6.6";
version = "3.6.7";
src = fetchFromGitHub {
owner = "zmap";
repo = "zlint";
tag = "v${finalAttrs.version}";
hash = "sha256-e17cMR2Zlhramv7RG3oriWTDR+UBjXUl+t8lZtqc34Q=";
hash = "sha256-qd6QqOeSfLpXwbni8wqmG5X9zYXDXwAxRotCws4AWsA=";
};
modRoot = "v3";
@@ -129,7 +129,11 @@ let
in
flutterVersions
// {
beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};
stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};
inherit wrapFlutter mkFlutter;
}
// lib.optionalAttrs (betaFlutterVersions != { }) {
beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};
}
// lib.optionalAttrs (stableFlutterVersions != { }) {
stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};
}
+7 -7
View File
@@ -42,12 +42,12 @@ in
);
julia_111-bin = wrapJulia (
callPackage (import ./generic-bin.nix {
version = "1.11.5";
version = "1.11.6";
sha256 = {
x86_64-linux = "723e878c642220cc0251a0e13758c059a389cadc7f01376feaf1ea7388fe8f9c";
aarch64-linux = "f63203574fba25c9bda5e98b2f87f985d4672109855633a46bae32bfba3cbc0d";
x86_64-darwin = "9bee8cc79a7dda56a38bbef88e72687ea0cb35d4c382eb9076ee8a3c53c3a8cf";
aarch64-darwin = "2c279005f5059d10eade27a59e25f5ea53e00b0caa30a6d73fa32529ec046735";
x86_64-linux = "e99e52e2029d845097c68f2372d836186f0eb3fb897a9dde0bdf9ee9250d03d5";
aarch64-linux = "c2c5cdce017cacadaccb7d22aa070f549e4e87c4bb10f15853170ddcb50bf5f4";
x86_64-darwin = "195a897e031595f59821dbcaf87514faa8d64220334b285c3e9809fce4958f79";
aarch64-darwin = "01caaa9c25fa1f071003807c8a6739de4941b5ec13751131128e00e21880e639";
};
}) { }
);
@@ -79,8 +79,8 @@ in
);
julia_111 = wrapJulia (
callPackage (import ./generic.nix {
version = "1.11.5";
hash = "sha256-FHYm22toh7+2YSy2zSpI1omAZkn6403HSf3cg3XCxiU=";
version = "1.11.6";
hash = "sha256-smje9BrcF0lsPg59y14nssvmocYcePZGNUTF9Mc0Foo=";
patches = [
./patches/1.11/0002-skip-failing-and-flaky-tests.patch
];
@@ -3,6 +3,7 @@
stdenv,
fetchurl,
autoreconfHook,
gettext,
pkg-config,
intltool,
glib,
@@ -51,6 +52,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preAutoreconf = ''
# error: possibly undefined macro: AM_NLS
cp ${gettext}/share/gettext/m4/nls.m4 m4
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
@@ -5,31 +5,27 @@
}:
{
disabled ? false,
propagatedBuildInputs ? [ ],
makeFlags ? [ ],
...
}@attrs:
if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
else
toLuaModule (
lua.stdenv.mkDerivation (
attrs
// {
name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
toLuaModule (
lua.stdenv.mkDerivation (
attrs
// {
name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
makeFlags = [
"PREFIX=$(out)"
"LUA_INC=-I${lua}/include"
"LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
"LUA_VERSION=${lua.luaversion}"
] ++ makeFlags;
makeFlags = [
"PREFIX=$(out)"
"LUA_INC=-I${lua}/include"
"LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
"LUA_VERSION=${lua.luaversion}"
] ++ makeFlags;
propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook
];
}
)
propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook
];
}
)
)
@@ -42,14 +42,14 @@
buildPythonPackage rec {
pname = "coffea";
version = "2025.7.0";
version = "2025.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "CoffeaTeam";
repo = "coffea";
tag = "v${version}";
hash = "sha256-Lbhxgn9aBtR/wmyxMJjyP813miG9FjaJ+rdHM6oTcvw=";
hash = "sha256-GtofpITO9QcwFcKyVTz7clquJy2tBTlkf3IR1cXlklM=";
};
build-system = [
@@ -1,5 +1,6 @@
{
lib,
stdenvNoCC,
buildPythonPackage,
fetchFromGitHub,
pythonAtLeast,
@@ -22,14 +23,14 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.51.0";
version = "0.52.0";
pyproject = true;
src = fetchFromGitHub {
owner = "DataDog";
repo = "datadogpy";
tag = "v${version}";
hash = "sha256-DIuKawqOzth8XYF+M3fYm2kMeo3UbfS34/Qa4Y9V1h8=";
hash = "sha256-CmSUbqctElk9sCyQAL+SKqJBpT1vlpmp6mEX6HWN8Po=";
};
build-system = [ hatchling ];
@@ -65,10 +66,17 @@ buildPythonPackage rec {
"test_timed"
"test_timed_in_ms"
"test_timed_start_stop_calls"
# OSError: AF_UNIX path too long
"test_socket_connection"
]
++ lib.optionals (pythonAtLeast "3.13") [
# https://github.com/DataDog/datadogpy/issues/880
"test_timed_coroutine"
]
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
# PermissionError: [Errno 1] Operation not permitted
"test_dedicated_uds_telemetry_dest"
];
pythonImportsCheck = [ "datadog" ];
@@ -76,7 +84,7 @@ buildPythonPackage rec {
meta = {
description = "Datadog Python library";
homepage = "https://github.com/DataDog/datadogpy";
changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/DataDog/datadogpy/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sarahec ];
};
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.57.0";
version = "2.58.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_container";
inherit version;
hash = "sha256-+n5vWT9YNIuYvW3Vk0TJpgOOn7psC5hY4j2dJ4NG8Sk=";
hash = "sha256-dA7lsWf3BmxIXXnPejksi21A7N9V0Ka27MeET8TNmts=";
};
build-system = [ setuptools ];
@@ -1,5 +1,6 @@
{
lib,
stdenvNoCC,
buildPythonPackage,
fetchFromGitHub,
@@ -60,6 +61,13 @@ buildPythonPackage rec {
enabledTestPaths = [ "tests/unit_tests" ];
disabledTests =
lib.optionals (stdenvNoCC.hostPlatform.isLinux && stdenvNoCC.hostPlatform.isAarch64)
[
# Compares a diff to a string literal and misses platform differences
"test_serdes"
];
pythonImportsCheck = [ "langchain_xai" ];
passthru.updateScript = gitUpdater {
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-cloud";
version = "0.1.33";
version = "0.1.34";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_cloud";
inherit version;
hash = "sha256-oLuQDVpuhvjHZ7SGhsUlNnmtfKG1dhLcObB2fletPXg=";
hash = "sha256-aGbkurR9LBhAvfFpwTwGF2kxwdMGl6wfpxureUKgQek=";
};
build-system = [ poetry-core ];
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
version = "1.37.0";
version = "1.38.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoftgraph";
repo = "msgraph-sdk-python";
tag = "v${version}";
hash = "sha256-1oz+2UQhBjRj2F243GNxmUfknVJFL/V2+jpqKZTDmDw=";
hash = "sha256-wHned9jggwEooSTtWc06bCE2WW15eAH1lvi3cbOUyJw=";
};
build-system = [ flit-core ];
@@ -0,0 +1,48 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchPypi,
pandas,
poetry-core,
pythonOlder,
requests,
zeep,
}:
buildPythonPackage rec {
pname = "noaa-coops";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "noaa_coops";
inherit version;
hash = "sha256-m3hTzUspYTMukwcj3uBbRahTmXbL1aJVD9NXfjwghB8=";
};
build-system = [ poetry-core ];
dependencies = [
pandas
requests
zeep
];
# The package does not include tests in the PyPI source distribution
doCheck = false;
pythonImportsCheck = [
"noaa_coops"
"noaa_coops.station"
];
meta = {
description = "Python wrapper for NOAA CO-OPS Tides & Currents Data and Metadata APIs";
homepage = "https://github.com/GClunies/noaa_coops";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.jamiemagee ];
};
}
@@ -31,19 +31,19 @@
buildPythonPackage rec {
pname = "nutpie";
version = "0.15.1";
version = "0.15.2";
pyproject = true;
src = fetchFromGitHub {
owner = "pymc-devs";
repo = "nutpie";
tag = "v${version}";
hash = "sha256-Mt3hCgmkgT9zWaHMvyjmO6U77/2os7E4zNOiyKWrRMo=";
hash = "sha256-9rcQtEdaafMyuNb/ezcqUmrwXbQFa9hdajGAtANdHOw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-ZUBrZqdesy0qKaxuD5gSlq7qOoXWn0aZNOidUb0grMM=";
hash = "sha256-6JWBJYGhSNUL8KYiEE2ZBW9xP4CmkCcwwhsO6aOvZyA=";
};
build-system = [
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
alembic,
@@ -67,6 +68,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "optuna_dashboard" ];
# Temporarily disable tests as they hang due to a torch bug on darwin
# Will revert in https://github.com/NixOS/nixpkgs/pull/424873
doCheck = !stdenv.hostPlatform.isDarwin;
meta = {
description = "Real-time Web Dashboard for Optuna";
homepage = "https://github.com/optuna/optuna-dashboard";
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools-scm,
@@ -10,7 +11,6 @@
matplotlib,
mizani,
pandas,
patsy,
scipy,
statsmodels,
@@ -24,41 +24,30 @@
buildPythonPackage rec {
pname = "plotnine";
version = "0.14.6";
version = "0.15.0";
pyproject = true;
src = fetchFromGitHub {
owner = "has2k1";
repo = "plotnine";
tag = "v${version}";
hash = "sha256-nTMu0zx13XepqQyrJrAvBCjjHdY02tlXlFk2kITHZfI=";
hash = "sha256-HhsJE5XoQjkIVExsfikTBArh9uq8ob4g2O0byYOsOh8=";
};
# Fixes: TypeError: hue_pal.__init__() got an unexpected keyword argument 'color_space'
#
# In the mizani 0.14.0 release, hue_pal was changed to use HCL color space from HSL (or HSLuv) space.
# The previous functionality is still available with hls_pal.
postPatch = ''
substituteInPlace plotnine/scales/scale_color.py \
--replace-fail \
"from mizani.palettes import hue_pal" \
"from mizani.palettes import hls_pal" \
--replace-fail \
"hue_pal(" \
"hls_pal("
'';
build-system = [ setuptools-scm ];
pythonRelaxDeps = [
"mizani"
patches = [
(fetchpatch {
name = "fix-composition-error-messages.patch";
url = "https://github.com/has2k1/plotnine/commit/097192de42d690c227b26ae7638accac0db14589.patch";
hash = "sha256-wxfJ36QH0PYdotgqrdE9sKAzKpcIYw7I8uNGhC6J0Gg=";
})
];
dependencies = [
matplotlib
mizani
pandas
patsy
scipy
statsmodels
];
@@ -77,6 +66,12 @@ buildPythonPackage rec {
# Tries to change locale. The issued warning causes this test to fail.
# UserWarning: Could not set locale to English/United States. Some date-related tests may fail
"test_no_after_scale_warning"
# Assertion Errors:
# Generated plot images do not exactly match the expected files.
# After manually checking, this is caused by extremely subtle differences in label placement.
# See https://github.com/has2k1/plotnine/issues/627
"test_aesthetics"
];
disabledTestPaths = [
@@ -99,6 +94,8 @@ buildPythonPackage rec {
"tests/test_geom_map.py"
"tests/test_geom_path_line_step.py"
"tests/test_geom_point.py"
"tests/test_geom_pointdensity.py"
"tests/test_geom_polygon.py"
"tests/test_geom_raster.py"
"tests/test_geom_rect_tile.py"
"tests/test_geom_ribbon_area.py"
@@ -107,11 +104,13 @@ buildPythonPackage rec {
"tests/test_geom_text_label.py"
"tests/test_geom_violin.py"
"tests/test_layout.py"
"tests/test_plot_composition.py"
"tests/test_position.py"
"tests/test_qplot.py"
"tests/test_scale_internals.py"
"tests/test_scale_labelling.py"
"tests/test_stat_ecdf.py"
"tests/test_stat_ellipse.py"
"tests/test_stat_function.py"
"tests/test_stat_summary.py"
"tests/test_theme.py"
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
hatchling,
requests,
}:
buildPythonPackage rec {
pname = "pycsspeechtts";
version = "1.0.8";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kgof0T22VRU96pKAWuEBo56F6t7o2X/xRS/L5B7UYDY=";
};
build-system = [ hatchling ];
dependencies = [ requests ];
# Tests require API key and network access
doCheck = false;
pythonImportsCheck = [ "pycsspeechtts" ];
meta = {
description = "Python library for Microsoft Cognitive Services Text-to-Speech";
homepage = "https://github.com/jeroenterheerdt/pycsspeechtts";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jamiemagee ];
};
}
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "pymc";
version = "5.23.0";
version = "5.24.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pymc-devs";
repo = "pymc";
tag = "v${version}";
hash = "sha256-Hlj5kOSMz8uoqeBkLiq9kT6CZrb2XJW9mas45G2EZB4=";
hash = "sha256-B4HFb+2Hzxt/eK5PdE9wNxQRNouSPi/9aKSrBV8xba4=";
};
build-system = [
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.68.1";
version = "0.68.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
tag = version;
hash = "sha256-4GvFCl4E/VUPDG3Ssz5v3ou5goPfCFEpAa1wKc3R+Ao=";
hash = "sha256-+YLLxLfDwj7bE6cHPFvkYFoQWSjbHeYfTk4rEHWHrk0=";
};
build-system = [ setuptools ];
+18 -18
View File
@@ -64,7 +64,7 @@
let
pname = "ray";
version = "2.47.1";
version = "2.48.0";
in
buildPythonPackage rec {
inherit pname version;
@@ -76,7 +76,7 @@ buildPythonPackage rec {
let
pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
platforms = {
aarch64-darwin = "macosx_11_0_arm64";
aarch64-darwin = "macosx_12_0_arm64";
aarch64-linux = "manylinux2014_aarch64";
x86_64-darwin = "macosx_12_0_x86_64";
x86_64-linux = "manylinux2014_x86_64";
@@ -85,28 +85,28 @@ buildPythonPackage rec {
# Results are in ./ray-hashes.nix
hashes = {
x86_64-linux = {
cp310 = "sha256-hKlrRyAXWgAAUhpI63qpFfO0Gbtc1hctje4AXD8juBM=";
cp311 = "sha256-SJYSKWFLK1alNb5RDIq8dumamqf6GVtclJvQxsaa9Ao=";
cp312 = "sha256-Pq6u7Du+LKZJPlMMMEc9hLhYCnrDJWu5GD2MY971qS8=";
cp313 = "sha256-JSpHHor7kYsQXNv/tMvrsBQ7qtdaBsj/zeJ6wxdXnMs=";
cp310 = "sha256-ZJ7ZRC3C05E1xZO2zww46DVRcLkmcjZat6PLyVjEJjQ=";
cp311 = "sha256-RtS0KlhJLex5yq0tViNEaJpPmagoruqBGgzSzWU1U+8=";
cp312 = "sha256-pC7TtkD0tZmj/IBnyD7mBJfA8D0HDXp98Co4j6F6VGs=";
cp313 = "sha256-JeS3n8yPhJ1y2xrMTwPzcAjFwLdF32PYowzTVna2VF4=";
};
aarch64-linux = {
cp310 = "sha256-b8ffhle432hLd8LRtkMTetdFqhwSreNHQ/BsynkAPfA=";
cp311 = "sha256-21/2UukDXwPGXhdCpwa3ZRn26KZ0TMAFOWBTrIdm/EY=";
cp312 = "sha256-zU5+tHVIc2S1IJljsXzv7ct/vTqBb9tt736lM+vXJCQ=";
cp313 = "sha256-1u1tGC4l1vdxedx3vJenScgXZbE8tnGkbbMgMCk4lmM=";
cp310 = "sha256-+CCVC8RNewAMIjNC9cgAycCOf9iVJCARJTiOohHKrRo=";
cp311 = "sha256-JKcPQW7AvhS5dfFgBEgFzLSMxrxQ3mMpg+uPCo4WaCs=";
cp312 = "sha256-8c8z0mAxb5L3dVgYXxw2/DVQbXbuf9/tn1tw+cS9un8=";
cp313 = "sha256-Yi5rzbeNmAQNh76pTmXQu2zMCuG0MpTGvWn1Qr8o4JI=";
};
x86_64-darwin = {
cp310 = "sha256-fAOh42bTqGilX4wvco9c41rIXd8JOsgdDBo1vxwlw3c=";
cp311 = "sha256-/uuh5xXP2HN9OtzSAY0M2rt8YIT6Swk+Y45sfULzyVY=";
cp312 = "sha256-5tnHjlOsicq7xAVq7P7FPFBsaS4xMq+drpQdYYDvRi8=";
cp313 = "sha256-5XiSn1iz8MWcdUSpbYZOJieCOLdV0TzRmueYBwyEjlc=";
cp310 = "sha256-M72kdTrQrNK1JMkVgInUNIbNRMxZ/pcEZkNbwpaP3i0=";
cp311 = "sha256-uUUA/i0X5JH+LpvUo79i3yF+IajyhFAzw1PU0uokD3M=";
cp312 = "sha256-Wm9XEm6sndMoYongfpHoewVHkvlpi298yriLYkgWtUI=";
cp313 = "sha256-V0K3KlFK/l1g9BMwIAzVCDduFsZQ9pYuYjN6pILWoMY=";
};
aarch64-darwin = {
cp310 = "sha256-NqMJMOjSZecI35bzf28fVIT0uXCQ1QWRL5kuBFpp0xA=";
cp311 = "sha256-pkDUR+Dmz2P4W5IgyIPsArsrjkCpwdhO+gEnlcdpumg=";
cp312 = "sha256-MiBJxFRs9n5e/a2Qw3HFUIrLsZPlqq9AOBA8bFzh9Xg=";
cp313 = "sha256-jNYl1GnOFTkeXx9E3fjdMLI4D5F2A/oBcmYSKaywAR8=";
cp310 = "sha256-bKK5zkWtNgy+KZaYL7Imkez+ZVPsj5eiVIKV8PlqrHg=";
cp311 = "sha256-S5uSrCljX1Ve80E0fZpj2/ArfZRjRyOa88CeNkvEXPg=";
cp312 = "sha256-jeeZ87CJb0jTBtXkoE/GA3oIxJXUX5x5k1NE5Wk+PPg=";
cp313 = "sha256-p6bYMNncWui7FW/N6aGtq39O2wBPA5GKck2IXs64Jk0=";
};
};
in
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "rns";
version = "0.9.6";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "markqvist";
repo = "Reticulum";
tag = version;
hash = "sha256-TZXImMtAesLF6u6Yw/mvpQOjXK07UI4Op4fniq+pSu0=";
hash = "sha256-d227mAVJKcm3Dx2HS7CvVsyWyLl7GoPSA/YrWjs7jm0=";
};
patches = [
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1424";
version = "3.0.1425";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-2febGkP4zm2dmOslHcLmcKRfn1EFJ5O/Ywn9XrouMpw=";
hash = "sha256-w4pvIWkMjFgn+v7Si8DwzSFhKobrz8EeRSiEmqyn1Ok=";
};
build-system = [ setuptools ];
@@ -64,14 +64,14 @@
buildPythonPackage rec {
pname = "torchrl";
version = "0.9.1";
version = "0.9.2";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "rl";
tag = "v${version}";
hash = "sha256-afaWDX5lIAoGTfrBSqrktYoA1S4hv6ogBaKYHc8dQ6E=";
hash = "sha256-6rU5+J70T0E7+60jihsjwlLls8jJlxKi3nmrL0xm2c0=";
};
build-system = [
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zabbix-utils";
version = "2.0.2";
version = "2.0.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zabbix";
repo = "python-zabbix-utils";
rev = "refs/tags/v${version}";
hash = "sha256-rRPen/FzWT0cCnXWiSdoybtXeP1pxYqnjq5b0QPVs1I=";
tag = "v${version}";
hash = "sha256-VEL7vAIodxFdw3XEjL0nSQL49RiaxfZdS+HcYUzxgho=";
};
build-system = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
meta = {
description = "Library for zabbix";
homepage = "https://github.com/zabbix/python-zabbix-utils";
changelog = "https://github.com/zabbix/python-zabbix-utils/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/zabbix/python-zabbix-utils/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
@@ -3567,7 +3567,8 @@
]; # missing inputs: microBeesPy
"microsoft" =
ps: with ps; [
]; # missing inputs: pycsspeechtts
pycsspeechtts
];
"microsoft_face" =
ps: with ps; [
pyturbojpeg
@@ -3983,7 +3984,8 @@
];
"noaa_tides" =
ps: with ps; [
]; # missing inputs: noaa-coops
noaa-coops
];
"nobo_hub" =
ps: with ps; [
pynobo
@@ -7293,6 +7295,7 @@
"meteoclimatic"
"metoffice"
"mfi"
"microsoft"
"microsoft_face"
"microsoft_face_detect"
"microsoft_face_identify"
@@ -7,20 +7,23 @@
buildHomeAssistantComponent rec {
owner = "thomasddn";
domain = "volvo_cars";
version = "1.5.4";
version = "1.5.6";
src = fetchFromGitHub {
owner = "thomasddn";
repo = "ha-volvo-cars";
tag = "v${version}";
hash = "sha256-oAGUa8KxLbzZs7xw/P9kwwG/ija03HXJ4jACluUd048=";
hash = "sha256-2eTUIbwAadJsOp1ETDY6+cEPVMOzhj1otEyzobysqaY=";
};
meta = with lib; {
meta = {
changelog = "https://github.com/thomasddn/ha-volvo-cars/releases/tag/${src.tag}";
homepage = "https://github.com/thomasddn/ha-volvo-cars";
description = "Volvo Cars Home Assistant integration";
maintainers = with maintainers; [ seberm ];
license = licenses.gpl3Only;
maintainers = with lib.maintainers; [
matteopacini
seberm
];
license = lib.licenses.gpl3Only;
};
}
-2
View File
@@ -543,8 +543,6 @@ with pkgs;
prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
opendrop = python3Packages.callPackage ../tools/networking/opendrop { };
pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
magika = with python3Packages; toPythonApplication magika;
+2 -5
View File
@@ -121,8 +121,6 @@ rec {
buildLuaPackage rec {
pname = "lua-pam";
version = "unstable-2015-07-03";
# Needed for `disabled`, overridden in buildLuaPackage
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "devurandom";
@@ -147,10 +145,9 @@ rec {
runHook postInstall
'';
# The package does not build with lua 5.4 or luaJIT
disabled = luaAtLeast "5.4" || isLuaJIT;
meta = with lib; {
# The package does not build with lua 5.4 or luaJIT
broken = luaAtLeast "5.4" || isLuaJIT;
description = "Lua module for PAM authentication";
homepage = "https://github.com/devurandom/lua-pam";
license = licenses.mit;
+4
View File
@@ -10370,6 +10370,8 @@ self: super: with self; {
nnpdf = toPythonModule (pkgs.nnpdf.override { python3 = python; });
noaa-coops = callPackage ../development/python-modules/noaa-coops { };
nocasedict = callPackage ../development/python-modules/nocasedict { };
nocaselist = callPackage ../development/python-modules/nocaselist { };
@@ -12516,6 +12518,8 @@ self: super: with self; {
pycsdr = callPackage ../development/python-modules/pycsdr { };
pycsspeechtts = callPackage ../development/python-modules/pycsspeechtts { };
pyct = callPackage ../development/python-modules/pyct { };
pyctr = callPackage ../development/python-modules/pyctr { };