Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -29,7 +29,6 @@ in
|
||||
default =
|
||||
{ ... }:
|
||||
{
|
||||
security.apparmor.enable = true;
|
||||
services.miniflux = {
|
||||
enable = true;
|
||||
inherit adminCredentialsFile;
|
||||
@@ -39,7 +38,6 @@ in
|
||||
withoutSudo =
|
||||
{ ... }:
|
||||
{
|
||||
security.apparmor.enable = true;
|
||||
services.miniflux = {
|
||||
enable = true;
|
||||
inherit adminCredentialsFile;
|
||||
@@ -50,7 +48,6 @@ in
|
||||
customized =
|
||||
{ ... }:
|
||||
{
|
||||
security.apparmor.enable = true;
|
||||
services.miniflux = {
|
||||
enable = true;
|
||||
config = {
|
||||
@@ -85,7 +82,6 @@ in
|
||||
externalDb =
|
||||
{ ... }:
|
||||
{
|
||||
security.apparmor.enable = true;
|
||||
services.miniflux = {
|
||||
enable = true;
|
||||
createDatabaseLocally = false;
|
||||
@@ -109,7 +105,6 @@ in
|
||||
machine.succeed(
|
||||
f"curl 'http://localhost:{port}/v1/me' -u '{user}' -H Content-Type:application/json | grep '\"is_admin\":true'"
|
||||
)
|
||||
machine.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
|
||||
|
||||
default.start()
|
||||
withoutSudo.start()
|
||||
|
||||
@@ -823,7 +823,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "145.0.7632.45",
|
||||
"version": "145.0.7632.75",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "fb0b652edba70f5c4ac867f3beca9e535f905b4c",
|
||||
@@ -835,16 +835,16 @@
|
||||
"hash": "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "145.0.7632.45-1",
|
||||
"hash": "sha256-U4ZUCwaokeMW3D+7xmilZu2OJiuLdwgZqyTdb+XabKs="
|
||||
"rev": "145.0.7632.75-1",
|
||||
"hash": "sha256-DlHNbochbPLRdD3wn1lW9S7x4OLzI+1cAMqjeTYNlA4="
|
||||
},
|
||||
"npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "7ad2aeb6be38786b2bf653d667d3df01e68d3c40",
|
||||
"hash": "sha256-l/gxUE0itdUQXLRAR2cp72hu21dgecZvWLC5Br0SPuo=",
|
||||
"rev": "ab0b95409566de9da1ed76e690022f774aec7793",
|
||||
"hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
tlsSupport ? false,
|
||||
openssl,
|
||||
pythonSupport ? false,
|
||||
python310,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional postgresSupport libpq
|
||||
++ lib.optional sqliteSupport sqlite
|
||||
++ lib.optional tlsSupport openssl
|
||||
++ lib.optional pythonSupport python310
|
||||
++ lib.optional pythonSupport python3
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
# To support systems without autoconf LD puts its configure.ac in a non-default
|
||||
@@ -94,6 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export LDFLAGS="$LDFLAGS -L${libiconv}/lib -liconv"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE =
|
||||
# Required for legacy C code in source
|
||||
"-std=gnu99";
|
||||
|
||||
installTargets = [
|
||||
"install-driver"
|
||||
"install-utils"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "miniflux";
|
||||
version = "2.2.16";
|
||||
version = "2.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniflux";
|
||||
repo = "v2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mJ0FgoTm/SzS/T6xcLk232Xs3TgaDQahib4BeWzNfAk=";
|
||||
hash = "sha256-Ru9yhI7EhLEdxmB3umOyub/SjmRY+tYxGsh2tEdZGCQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XrTmXAUABlTQaA3Z0vU0HQW5Q1e/Yg6yq690oZH8M+A=";
|
||||
vendorHash = "sha256-BRgS58D8G6TGo7+jGjlmHrNUvVLgBE5Mm7/A/PekoI8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "12.09";
|
||||
version = "12.13";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-ACygfj+VV3cUvrnoU4cjvMFsTWnKOpzzfj+oMJbF5+I=";
|
||||
hash = "sha256-S9YZ2MdblIm/Der6RS9ryGNijUZJOmQRARKG6x/Zu3s=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.7.2";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BS/EB64y/ytHqfKdAmTV0ahT6HQPo96cs+O1CYwd8Rs=";
|
||||
hash = "sha256-eUkP5fLXzcoVz8HPnPr0qQOXN2iTYS/ZJ73c9PgjCiU=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-OH0TuHN324Ef7ZX2JpWVi5q0ycgf1E+UXJj2b3ubMd4=";
|
||||
npmDepsHash = "sha256-FifLj2Aj0cfUmGHm39N7HIpAUmTBgGH2cjwTH+ChlgA=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
@@ -106,6 +106,7 @@ python3Packages.buildPythonApplication rec {
|
||||
beautifulsoup4
|
||||
black
|
||||
boto3
|
||||
brotli
|
||||
chardet
|
||||
chromadb
|
||||
cryptography
|
||||
@@ -174,6 +175,7 @@ python3Packages.buildPythonApplication rec {
|
||||
python-pptx
|
||||
python-socketio
|
||||
pytube
|
||||
pytz
|
||||
pyxlsb
|
||||
rank-bm25
|
||||
rapidocr-onnxruntime
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "slidev-cli";
|
||||
version = "52.11.5";
|
||||
version = "52.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slidevjs";
|
||||
repo = "slidev";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m8h5bFanJsi85B5DJuAK+YbY+GY/DDvLqpnB/U3XtG4=";
|
||||
hash = "sha256-VYeDQ1Ieam0vJB3P1RvVbatAsZ0HtzX3ZP4Ws9aXO5Y=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [ "@slidev/cli..." ];
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "walker";
|
||||
version = "2.14.1";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abenz1267";
|
||||
repo = "walker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=";
|
||||
hash = "sha256-y1jBFFO0u+V21y3YldHZozrDwVJVrdC+o3c4M8/rasU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2amur4gkjtYV+CyArBCbMVy9p+2MLl2afQ/diR/4GDo=";
|
||||
cargoHash = "sha256-7QQdHbkwjVcZCd2FaBxLL5BUSoWjTsH1GuDhzh7DuRY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
|
||||
@@ -19,7 +19,12 @@ buildPythonPackage rec {
|
||||
owner = "rsalmei";
|
||||
repo = "alive-progress";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DxyTGY72uVKHqZZQ4jj4jVdfZAKkgAtHJ7VBI/dM6DQ=";
|
||||
hash = "sha256-2ymLdmaV7mO6tp5bjmbL/67xLP7Srfpt5m8YhOHGmWQ=";
|
||||
# Avoid downloading heavy images in img directory
|
||||
sparseCheckout = [
|
||||
"alive_progress"
|
||||
"tests"
|
||||
];
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,28 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
azure-core,
|
||||
azure-storage-blob,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isodate,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-storage-file-datalake";
|
||||
version = "12.17.0";
|
||||
version = "12.21.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-sdk-for-python";
|
||||
tag = "azure-storage-file-datalake_${version}";
|
||||
hash = "sha256-FT51a7yuSMLJSnMFK9N09Rc8p/uaoYCcj9WliSvY6UA=";
|
||||
src = fetchPypi {
|
||||
pname = "azure_storage_file_datalake";
|
||||
inherit version;
|
||||
hash = "sha256-tJzSFW6jJfb0So9mdNc8WUnprEjWSA+vkBspOYVfzdM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/storage/azure-storage-file-datalake";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -38,15 +35,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "azure.storage.filedatalake" ];
|
||||
|
||||
# require devtools_testutils which is a internal package for azure-sdk
|
||||
# Tests are only available in mono repo
|
||||
doCheck = false;
|
||||
|
||||
# multiple packages in a singel repo, and the updater picks the wrong tag
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = {
|
||||
description = "Microsoft Azure File DataLake Storage Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-file-datalake_${version}/sdk/storage/azure-storage-file-datalake/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grapheme";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1jiwc3w05c8kh22s3zk7a8km8na3plqc5zimb2qcyxxy3grbkhj4";
|
||||
};
|
||||
|
||||
# Tests are no available on PyPI
|
||||
# https://github.com/alvinlindstam/grapheme/issues/18
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "grapheme" ];
|
||||
|
||||
meta = {
|
||||
description = "Python package for grapheme aware string handling";
|
||||
homepage = "https://github.com/alvinlindstam/grapheme";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ creator54 ];
|
||||
};
|
||||
}
|
||||
@@ -4,18 +4,19 @@
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "grapheme";
|
||||
version = "0.8.0";
|
||||
pname = "graphemeu";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timendum";
|
||||
repo = "grapheme";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FDQKjxQAW+krUScZKmfv9ytVPIcEKNrbHurXb5wVeIM=";
|
||||
hash = "sha256-qDspbeOmlfQ4VLPdKEuxNPYilKjwUcAJiEOMfx9fFlI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -23,6 +24,7 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -31,10 +33,10 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Grapheme";
|
||||
description = "Python package for grapheme aware string handling";
|
||||
homepage = "https://github.com/timendum/grapheme";
|
||||
changelog = "https://github.com/timendum/grapheme/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/timendum/grapheme/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ anthonyroussel ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
blurhash,
|
||||
cryptography,
|
||||
decorator,
|
||||
grapheme,
|
||||
graphemeu,
|
||||
http-ece,
|
||||
python-dateutil,
|
||||
python-magic,
|
||||
@@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
|
||||
optional-dependencies = {
|
||||
blurhash = [ blurhash ];
|
||||
grapheme = [ grapheme ];
|
||||
grapheme = [ graphemeu ];
|
||||
webpush = [
|
||||
http-ece
|
||||
cryptography
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "samoswall";
|
||||
domain = "polaris";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samoswall";
|
||||
repo = "polaris-mqtt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nT7sLN61XOakYL2kZXQc6qrEAIaf0jEfm4wxZ0viK8c=";
|
||||
hash = "sha256-/HMR+BZuwAoqFfELkjhT3k5NKMc2ahE/I3DTR1lQ5L0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -203,6 +203,7 @@ mapAliases {
|
||||
gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09
|
||||
gpy = throw "'gpy' has been removed as it is based on 'paramz', which was removed"; # added 2025-11-10
|
||||
gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29
|
||||
grapheme = throw "'grapheme' has been removed as it is unmaintained upstream. Consider using 'graphemeu' instead."; # Converted to throw 2025-12-22
|
||||
grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29
|
||||
groestlcoin_hash = throw "'groestlcoin_hash' has been renamed to/replaced by 'groestlcoin-hash'"; # Converted to throw 2025-10-29
|
||||
grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -6571,7 +6571,7 @@ self: super: with self; {
|
||||
|
||||
graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal graphviz; };
|
||||
|
||||
grapheme = callPackage ../development/python-modules/grapheme { };
|
||||
graphemeu = callPackage ../development/python-modules/graphemeu { };
|
||||
|
||||
graphemeu = callPackage ../development/python-modules/graphemeu { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user