Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-11-10 00:15:17 +00:00 committed by GitHub
commit 48d4a0a6bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
54 changed files with 6109 additions and 636 deletions

View File

@ -0,0 +1,27 @@
---
name: Module requests
about: For NixOS modules that you would like to see
title: 'Module request: MODULENAME'
labels: '9.needs: module (new)'
assignees: ''
---
### Description
<!-- Describe what the module should accomplish: -->
### Notify maintainers
<!-- If applicable, tag the maintainers of the package that corresponds to the module. If the search.nixos.org result shows no maintainers, tag the person that last updated the package. -->
-----
Note for maintainers: Please tag this issue in your PR.
---
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@ -116,7 +116,7 @@ in
description = ''
Configuration for Immich.
See <https://immich.app/docs/install/config-file/> or navigate to
<https://your-immich-domain/admin/system-settings> for
<https://my.immich.app/admin/system-settings> for
options and defaults.
Setting it to `null` allows configuring Immich in the web interface.
'';
@ -270,7 +270,7 @@ in
let
postgresEnv =
if isPostgresUnixSocket then
{ DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; }
{ DB_URL = "postgresql:///${cfg.database.name}?host=${cfg.database.host}"; }
else
{
DB_HOSTNAME = cfg.database.host;
@ -317,6 +317,11 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
inherit (cfg) environment;
path = [
# gzip and pg_dumpall are used by the backup service
pkgs.gzip
config.services.postgresql.package
];
serviceConfig = commonServiceConfig // {
ExecStart = lib.getExe cfg.package;

View File

@ -31,21 +31,30 @@ import ../make-test-python.nix (
machine.succeed("curl --fail http://localhost:2283/")
machine.succeed("""
curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:2283/api/auth/admin-sign-up
curl -f --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up
""")
res = machine.succeed("""
curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:2283/api/auth/login
curl -f --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login
""")
token = json.loads(res)['accessToken']
res = machine.succeed("""
curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:2283/api/api-keys
curl -f -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys
""" % token)
key = json.loads(res)['secret']
machine.succeed(f"immich login http://localhost:2283/api {key}")
res = machine.succeed("immich server-info")
print(res)
machine.succeed("""
curl -f -X PUT -H 'Cookie: immich_access_token=%s' --json '{ "command": "start" }' http://localhost:2283/api/jobs/backupDatabase
""" % token)
res = machine.succeed("""
curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs
""" % token)
assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1
machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz")
'';
}
)

View File

@ -39,9 +39,9 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
configurePhase = "configurePhase";
buildPhase = "buildPhase";
checkPhase = "checkPhase";
installPhase = "installPhase";
dontCargoBuild = true;
dontCargoCheck = true;
dontCargoInstall = true;
postPatch = ''
# Have to do this here instead of in preConfigure because

View File

@ -1532,6 +1532,13 @@ in
dependencies = with self; [ ultisnips ];
};
neoconf-nvim = super.neoconf-nvim.overrideAttrs {
dependencies = with self; [ nvim-lspconfig ];
doInstallCheck = true;
nvimRequireCheck = "neoconf";
};
neogit = super.neogit.overrideAttrs {
dependencies = with self; [ plenary-nvim ];
nvimRequireCheck = "neogit";

View File

@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "sourcery";
publisher = "sourcery";
version = "1.23.0";
hash = "sha256-wMky9whajltZYD3PUG+LCzuK9S5t55+3tRjTyA8kFcY=";
version = "1.24.0";
hash = "sha256-T2AbGxBytHXWP/ZKBhglRRbvPZ6px90XnSadwZTe/BM=";
};
postPatch = ''

View File

@ -27,6 +27,12 @@ let
nativeBuildInputs = [ installShellFiles ];
ldflags = [
"-X github.com/hashicorp/nomad/version.Version=${version}"
"-X github.com/hashicorp/nomad/version.VersionPrerelease="
"-X github.com/hashicorp/nomad/version.BuildDate=1970-01-01T00:00:00Z"
];
# ui:
# Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag.
@ -89,9 +95,9 @@ rec {
nomad_1_9 = generic {
buildGoModule = buildGo123Module;
version = "1.9.0";
sha256 = "sha256-MJNPYSH3KsRmGQeOcWw4VvDeFGinfsyGSo4q3OdOZo8=";
vendorHash = "sha256-Ss/qwQ14VUu40nXaIgTfNuj95ekTTVrY+zcStFDSCyI=";
version = "1.9.2";
sha256 = "sha256-HIyRzujAGwhB2anbxidhq5UpWYHkigyyHfxIUwMF5X8=";
vendorHash = "sha256-YIOTdD+oRDdEHkBzQCUuKCz7Wbj4mFjrZY0J3Cte400=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''

View File

@ -20,14 +20,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.9.8";
version = "24.11.1";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-G5PLz1GzjfPM5tj3rtwJt4hR3v+oSq2bVr/llTSFbNk=";
hash = "sha256-OQ6p5VCdQZ2P1UFiCPtK+HogIgaoBQKdKO1tEDCA/5I=";
};
nativeBuildInputs = [

View File

@ -13,166 +13,176 @@ let
packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
};
version = "0.62.0";
in
python3.pkgs.buildPythonApplication {
pname = "aider-chat";
inherit version;
pyproject = true;
aider-chat = python3.pkgs.buildPythonApplication {
pname = "aider-chat";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "Aider-AI";
repo = "aider";
rev = "refs/tags/v${version}";
hash = "sha256-o5vyOaJSUcdwuHBbzgpo5RDpZLnIur5dM+b7Y7PVBXA=";
};
src = fetchFromGitHub {
owner = "Aider-AI";
repo = "aider";
rev = "refs/tags/v${version}";
hash = "sha256-o5vyOaJSUcdwuHBbzgpo5RDpZLnIur5dM+b7Y7PVBXA=";
};
pythonRelaxDeps = true;
pythonRelaxDeps = true;
build-system = with python3.pkgs; [ setuptools-scm ];
build-system = with python3.pkgs; [ setuptools-scm ];
dependencies = with python3.pkgs; [
aiohappyeyeballs
aiohttp
aiosignal
annotated-types
anyio
attrs
backoff
beautifulsoup4
certifi
cffi
charset-normalizer
click
configargparse
diff-match-patch
diskcache
distro
filelock
flake8
frozenlist
fsspec
gitdb
gitpython
grep-ast
h11
httpcore
httpx
huggingface-hub
idna
importlib-resources
jinja2
jiter
json5
jsonschema
jsonschema-specifications
litellm
markdown-it-py
markupsafe
mccabe
mdurl
multidict
networkx
numpy
openai
packaging
pathspec
pexpect
pillow
prompt-toolkit
psutil
ptyprocess
pycodestyle
pycparser
pydantic
pydantic-core
pydub
pyflakes
pygments
pypandoc
pyperclip
python-dotenv
pyyaml
referencing
regex
requests
rich
rpds-py
scipy
smmap
sniffio
sounddevice
soundfile
soupsieve
tiktoken
tokenizers
tqdm
tree-sitter
tree-sitter-languages
typing-extensions
urllib3
wcwidth
yarl
zipp
# Not listed in requirements
mixpanel
monotonic
posthog
propcache
python-dateutil
];
buildInputs = [ portaudio ];
nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ];
disabledTestPaths = [
# Tests require network access
"tests/scrape/test_scrape.py"
# Expected 'mock' to have been called once
"tests/help/test_help.py"
];
disabledTests =
[
# Tests require network
"test_urls"
"test_get_commit_message_with_custom_prompt"
# FileNotFoundError
"test_get_commit_message"
# Expected 'launch_gui' to have been called once
"test_browser_flag_imports_streamlit"
# AttributeError
"test_simple_send_with_retries"
# Expected 'check_version' to have been called once
"test_main_exit_calls_version_check"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Tests fails on darwin
"test_dark_mode_sets_code_theme"
"test_default_env_file_sets_automatic_variable"
];
preCheck = ''
export HOME=$(mktemp -d)
export AIDER_CHECK_UPDATE=false
'';
optional-dependencies = with python3.pkgs; {
playwright = [
greenlet
playwright
pyee
dependencies = with python3.pkgs; [
aiohappyeyeballs
aiohttp
aiosignal
annotated-types
anyio
attrs
backoff
beautifulsoup4
certifi
cffi
charset-normalizer
click
configargparse
diff-match-patch
diskcache
distro
filelock
flake8
frozenlist
fsspec
gitdb
gitpython
grep-ast
h11
httpcore
httpx
huggingface-hub
idna
importlib-resources
jinja2
jiter
json5
jsonschema
jsonschema-specifications
litellm
markdown-it-py
markupsafe
mccabe
mdurl
multidict
networkx
numpy
openai
packaging
pathspec
pexpect
pillow
prompt-toolkit
psutil
ptyprocess
pycodestyle
pycparser
pydantic
pydantic-core
pydub
pyflakes
pygments
pypandoc
pyperclip
python-dotenv
pyyaml
referencing
regex
requests
rich
rpds-py
scipy
smmap
sniffio
sounddevice
soundfile
soupsieve
tiktoken
tokenizers
tqdm
tree-sitter
tree-sitter-languages
typing-extensions
];
};
urllib3
wcwidth
yarl
zipp
meta = {
description = "AI pair programming in your terminal";
homepage = "https://github.com/paul-gauthier/aider";
changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ taha-yassine ];
mainProgram = "aider";
# Not listed in requirements
mixpanel
monotonic
posthog
propcache
python-dateutil
];
buildInputs = [ portaudio ];
nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ];
disabledTestPaths = [
# Tests require network access
"tests/scrape/test_scrape.py"
# Expected 'mock' to have been called once
"tests/help/test_help.py"
];
disabledTests =
[
# Tests require network
"test_urls"
"test_get_commit_message_with_custom_prompt"
# FileNotFoundError
"test_get_commit_message"
# Expected 'launch_gui' to have been called once
"test_browser_flag_imports_streamlit"
# AttributeError
"test_simple_send_with_retries"
# Expected 'check_version' to have been called once
"test_main_exit_calls_version_check"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Tests fails on darwin
"test_dark_mode_sets_code_theme"
"test_default_env_file_sets_automatic_variable"
];
preCheck = ''
export HOME=$(mktemp -d)
export AIDER_CHECK_UPDATE=false
'';
optional-dependencies = with python3.pkgs; {
playwright = [
greenlet
playwright
pyee
typing-extensions
];
};
passthru = {
withPlaywright = aider-chat.overridePythonAttrs (
{ dependencies, ... }:
{
dependencies = dependencies ++ aider-chat.optional-dependencies.playwright;
}
);
};
meta = {
description = "AI pair programming in your terminal";
homepage = "https://github.com/paul-gauthier/aider";
changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ taha-yassine ];
mainProgram = "aider";
};
};
}
in
aider-chat

5112
pkgs/by-name/ch/chiptrack/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,146 @@
{
clangStdenv,
rustPlatform,
lib,
linkFarm,
fetchgit,
fetchFromGitHub,
runCommand,
alsa-lib,
brotli,
cmake,
expat,
fontconfig,
freetype,
gn,
harfbuzz,
icu,
libglvnd,
libjpeg,
libxkbcommon,
libX11,
libXcursor,
libXext,
libXi,
libXrandr,
makeWrapper,
ninja,
pkg-config,
python3,
removeReferencesTo,
wayland,
zlib,
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "chiptrack";
version = "0.3.1";
src = fetchFromGitHub {
owner = "jturcotte";
repo = "chiptrack";
rev = "refs/tags/v${version}";
hash = "sha256-Iehe4dD7nWoBB6RaYLvPvV6bBKEc3Kdkwrhb8Ry+s9s=";
};
strictDeps = true;
nativeBuildInputs = [
rustPlatform.bindgenHook
cmake
makeWrapper
pkg-config
python3
removeReferencesTo
];
buildInputs = [
expat
fontconfig
freetype
harfbuzz
icu
libjpeg
] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
# Has git dependencies
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rboy-0.1.0" = "sha256-2Acgg5phDAVTJht3XIXO7/TV5FxEXyLQJtC5n7cd9Ek=";
"wamr-sys-1.2.0" = "sha256-lNpJjHqdaYi/cyoAb8RlsKuLQ9WhuGwlzcSpDM68Kco=";
};
};
env = {
SKIA_SOURCE_DIR =
let
repo = fetchFromGitHub {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
rev = "refs/tags/m121-0.69.1";
hash = "sha256-OviOIiw3RvQx1dvtQ9kWIc/mGVPOOsLVCIRoBJrC72M=";
};
# The externals for skia are taken from skia/DEPS
# Reduced to only what's necessary
externals = linkFarm "skia-externals" (
lib.mapAttrsToList (name: value: {
inherit name;
path = fetchgit value;
}) (lib.importJSON ./skia-externals.json)
);
in
runCommand "source" { } ''
cp -R ${repo} $out
chmod -R +w $out
ln -s ${externals} $out/third_party/externals
'';
SKIA_GN_COMMAND = lib.getExe gn;
SKIA_NINJA_COMMAND = lib.getExe ninja;
SKIA_USE_SYSTEM_LIBRARIES = "1";
NIX_CFLAGS_COMPILE = "-I${lib.getDev harfbuzz}/include/harfbuzz";
};
# library skia embeds the path to its sources
postFixup = ''
remove-references-to -t "$SKIA_SOURCE_DIR" \
$out/bin/chiptrack
wrapProgram $out/bin/chiptrack \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (
[
brotli
zlib
]
++ lib.optionals clangStdenv.hostPlatform.isLinux [
libglvnd
libxkbcommon
libX11
libXcursor
libXext
libXrandr
libXi
wayland
]
)
}
'';
disallowedReferences = [ env.SKIA_SOURCE_DIR ];
meta = {
description = "Programmable cross-platform sequencer for the Game Boy Advance sound chip";
homepage = "https://github.com/jturcotte/chiptrack";
license = with lib.licenses; [
mit # main
gpl3Only # GPL dependencies
];
mainProgram = "chiptrack";
maintainers = with lib.maintainers; [ OPNA2608 ];
# Various issues with wrong max macOS version & misparsed target conditional checks, can't figure out the magic combination for this
broken = clangStdenv.hostPlatform.isDarwin;
};
}

View File

@ -0,0 +1,7 @@
{
"wuffs": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
"hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
}
}

View File

@ -83,8 +83,7 @@ rustPlatform.buildRustPackage rec {
"CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
# Use default stdenv installPhase, not the buildRustPackage one.
installPhase = "installPhase";
dontCargoInstall = true;
# These libraries are only used by the X11 backend, which will not
# be the common case, so just make them available, don't link them.

View File

@ -3,6 +3,7 @@
stdenvNoCC,
buildNpmPackage,
fetchFromGitHub,
fetchpatch2,
python3,
nodejs,
node-gyp,
@ -17,12 +18,12 @@
cacert,
unzip,
# runtime deps
exiftool,
jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943
imagemagick,
libraw,
libheif,
vips,
perl,
}:
let
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
@ -146,6 +147,13 @@ buildNpmPackage' {
src = "${src}/server";
inherit (sources.components.server) npmDepsHash;
postPatch = ''
# pg_dumpall fails without database root access
# see https://github.com/immich-app/immich/issues/13971
substituteInPlace src/services/backup.service.ts \
--replace-fail '`pg_dumpall`' '`pg_dump`'
'';
nativeBuildInputs = [
pkg-config
python3
@ -166,7 +174,7 @@ buildNpmPackage' {
makeCacheWritable = true;
preBuild = ''
cd node_modules/sharp
pushd node_modules/sharp
mkdir node_modules
ln -s ${node-addon-api} node_modules/node-addon-api
@ -175,8 +183,13 @@ buildNpmPackage' {
rm -r node_modules
cd ../..
popd
rm -r node_modules/@img/sharp*
# If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
rm -r node_modules/exiftool-vendored.*
substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \
--replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false,"
'';
installPhase = ''
@ -197,7 +210,7 @@ buildNpmPackage' {
--set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \
--suffix PATH : "${
lib.makeBinPath [
perl
exiftool
jellyfin-ffmpeg
]
}"

View File

@ -1,22 +1,22 @@
{
"version": "1.119.1",
"hash": "sha256-T+bIL2LaVNgFT3xBUxiEzhyDiLpw/WU7mxttuJD39SQ=",
"version": "1.120.1",
"hash": "sha256-FKPs6BHOXmqnHh2yH+PPBFQoK5ykP716dNvES/45t4g=",
"components": {
"cli": {
"npmDepsHash": "sha256-kTBlo6eIPswZC0GQG7IoqQZ5b7wPEXFaD/SuuaEQMEg=",
"version": "2.2.28"
"npmDepsHash": "sha256-5JmcDjLAVXhF3TH0M88dKLYPDsSctcOGPz9nV1n3k9c=",
"version": "2.2.30"
},
"server": {
"npmDepsHash": "sha256-zgzqh3TyafPKuk5RZ2I/haYFzMVlI4jGnwD5XLqTBdg=",
"version": "1.119.1"
"npmDepsHash": "sha256-u2ZQv+z8uyn7z52V+7hNRWgnHVm4xMdhjspPqsLHYek=",
"version": "1.120.1"
},
"web": {
"npmDepsHash": "sha256-LPtsMzF7yYGrrpDoYoba6OQphKY7AvGbJpPc5pS4eFU=",
"version": "1.119.1"
"npmDepsHash": "sha256-EAFUOhcmE1TfUBN0uxzuNkHibdaDRn8Lxvma70UJqDE=",
"version": "1.120.1"
},
"open-api/typescript-sdk": {
"npmDepsHash": "sha256-dyKmDez8jO6p+cmSa2KMe9zzhXn4on3aFUMdep+gjzU=",
"version": "1.119.1"
"npmDepsHash": "sha256-AJcK5NE+ZNAK2FJblY32jtYxY0Z9npH92A3htcPes4A=",
"version": "1.120.1"
}
}
}

View File

@ -3,21 +3,21 @@
}:
let
pname = "josm";
version = "19230";
version = "19253";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis=";
hash = "sha256-GnN+XtGzhLZ2PKAGHv+GMMh0FpilwET7EfKI4CAwYgg=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I=";
hash = "sha256-bcCl+w+pvsR+8QXKjM9bVyTAgzp+wre71tZMp5+VJTA=";
};
pkg = fetchFromGitHub {
owner = "JOSM";
repo = "josm";
rev = "refs/tags/${version}-tested";
hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY=";
hash = "sha256-I1mMtNzFkBoU0qcx2rVd9nmDK91ccVyaKwPft72M3r0=";
};
};

File diff suppressed because it is too large Load Diff

View File

@ -4,21 +4,21 @@
makeWrapper,
php,
}:
php.buildComposerProject (finalAttrs: {
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.8.3";
version = "5.9.2";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
rev = "v${finalAttrs.version}";
hash = "sha256-a7DbpjIcT1JbhuzpzQVQ/iiWLAVF/XisrTUsDbR78XQ=";
hash = "sha256-XE1KYOlWehj1peSNj3sKNr6CKchCxRNpIjXHq7slVME=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-NyD/kyqGyE+yO7wCitMipTWnKbGSd/FSQ3iGcXvCv5Y=";
vendorHash = "sha256-jUg0hmkShzK1CAO3+Btqe3/5GFKVxRKDtIxmUuU3EdU=";
postInstall = ''
wrapProgram $out/bin/laravel \

View File

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
version = "5.5.4";
version = "5.5.5";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
hash = "sha256-rC2vQcaanK2nNSDtiXNhyBiV0SN3QqtwU8WNBc7D/Nw=";
hash = "sha256-rvJ3pyAbHI2/g3v+eKQF0Q9mx6+lLozaB8CLAAzOXRs=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
version = "2.0.25";
version = "2.0.27";
src = fetchFromGitHub {
owner = "kvndrsslr";
repo = "sketchybar-app-font";
rev = "v2.0.25";
hash = "sha256-R3vf9IyMiPBC0cFjvRcaIDqd/q76dA2RbOjZKCwdk/Y=";
rev = "v2.0.27";
hash = "sha256-IgyDJvx+CxjSm2Aoh6TEPUcGdPJi48YnNyAhGUYVYjQ=";
};
pnpmDeps = pnpm.fetchDeps {

View File

@ -17,6 +17,9 @@
, vulkan-headers
, vulkan-memory-allocator
, xcbuild
, cctools
, zlib
, apple-sdk_11
, enableVulkan ? !stdenv.hostPlatform.isDarwin
}:
@ -46,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
gn
ninja
python3
] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools.libtool zlib ];
buildInputs = [
expat
@ -61,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals enableVulkan [
vulkan-headers
vulkan-memory-allocator
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
];
gnFlags = let
@ -92,13 +97,15 @@ stdenv.mkDerivation (finalAttrs: {
"skia_use_vulkan=true"
];
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lz";
# Somewhat arbitrary, but similar to what other distros are doing
installPhase = ''
runHook preInstall
# Libraries
mkdir -p $out/lib
cp *.so *.a $out/lib
cp *.so *.a *.dylib $out/lib
# Includes
pushd ../../include
@ -144,7 +151,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ fgaz ];
platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64;
pkgConfigModules = [ "skia" ];
# https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016
broken = stdenv.hostPlatform.isDarwin;
};
})

View File

@ -8,18 +8,18 @@
rustPlatform.buildRustPackage rec {
pname = "wttrbar";
version = "0.10.6";
version = "0.11.0";
src = fetchFromGitHub {
owner = "bjesus";
repo = "wttrbar";
rev = version;
hash = "sha256-fuLKWooXn966RORH20D9wwbjNtyLEZOO8Y8RcjsFwqM=";
hash = "sha256-EEc64pTAdVZZJtzHzACxZktUJMz10yuqdYG+N1CAD8k=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-Of1tHKIL2XbzA6YFxtvaP9sa+KMw8uJTFG0n84g2Eog=";
cargoHash = "sha256-UXC7b0FDyKSRpYGJOLcG0mqZgKTLJA+eTqKMp1Zo1so=";
passthru.updateScript = nix-update-script { };

View File

@ -3406,14 +3406,14 @@ buildLuarocksPackage {
toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
buildLuarocksPackage {
pname = "toml-edit";
version = "0.6.0-1";
version = "0.6.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/toml-edit-0.6.0-1.rockspec";
sha256 = "10mmxaw2nxg80zx7idfy3sjj4d4ma2g2bja14bnk1qx584dy7m4k";
url = "mirror://luarocks/toml-edit-0.6.1-1.rockspec";
sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.0.zip";
sha256 = "1f574g0c5h40jr0l1gzniz3qzxn1pcnfyzrizqp311i1qnkz05ir";
url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip";
sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg";
};
disabled = luaOlder "5.1";

View File

@ -831,7 +831,7 @@ in
cargoDeps = rustPlatform.fetchCargoTarball {
src = oa.src;
hash = "sha256-+LiqX4ZUyr6qj0Q91TB1eu6SWgAx/kps9tOkDW18tMo=";
hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E=";
};
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.126";
version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "ailment";
rev = "refs/tags/v${version}";
hash = "sha256-C5hOeMdZ0D8T61TyJ8uEhuy+VnVc/6GQ3PteuicUpzA=";
hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U=";
};
build-system = [ setuptools ];

View File

@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.126";
version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
hash = "sha256-M74RNmjld7nuybotPjNZ1bYMDlYnOn1c/clS2ZlMe/o=";
hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg=";
};
postPatch = ''

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.126";
version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "archinfo";
rev = "refs/tags/v${version}";
hash = "sha256-LMRZMZeQZVDnIUyqtE90WI9uFHIPSm5d0duWw5ew054=";
hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg=";
};
build-system = [ setuptools ];

View File

@ -1,87 +1,160 @@
{
gui ? true,
lib,
buildPythonPackage,
fetchFromGitHub,
lib,
sphinx,
lxml,
setuptools,
setuptools-scm,
certifi,
filelock,
isodate,
lxml,
numpy,
openpyxl,
tkinter ? null,
py3to2,
isPy3k,
python,
...
pyparsing,
python-dateutil,
regex,
gui ? true,
tkinter,
pycryptodome,
pg8000,
pymysql,
pyodbc,
rdflib,
holidays,
pytz,
tinycss2,
graphviz,
cheroot,
cherrypy,
tornado,
sphinxHook,
sphinx-autodoc2,
myst-parser,
sphinx-copybutton,
furo,
pytestCheckHook,
boto3,
}:
buildPythonPackage rec {
pname = "arelle${lib.optionalString (!gui) "-headless"}";
version = "18.3";
format = "setuptools";
version = "2.30.25";
pyproject = true;
disabled = !isPy3k;
# Releases are published at http://arelle.org/download/ but sadly no
# tags are published on github.
src = fetchFromGitHub {
owner = "Arelle";
repo = "Arelle";
rev = "edgr${version}";
sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
rev = "refs/tags/${version}";
hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY=";
};
outputs = [
"out"
"doc"
];
patches = [ ./tests.patch ];
postPatch = "rm testParser2.py";
nativeBuildInputs = [
sphinx
py3to2
postPatch = ''
substituteInPlace pyproject.toml --replace-fail \
'requires = ["setuptools~=73.0", "wheel~=0.44", "setuptools_scm[toml]~=8.1"]' \
'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
# Darwin currently doesn't have the native `_decimal` module
# Instead, we'll use the wrapper `decimal` module that can fall back to python based implementation
# These lines can be removed after https://github.com/NixOS/nixpkgs/pull/354125 hits master
substituteInPlace arelle/Validate{DuplicateFacts,XbrlCalcs}.py tests/unit_tests/arelle/test_{xmlvalidate,validatexbrlcalcs}.py \
--replace-fail 'from _decimal import' 'from decimal import'
'';
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
lxml
dependencies = [
certifi
filelock
isodate
lxml
numpy
openpyxl
pyparsing
python-dateutil
regex
] ++ lib.optionals gui [ tkinter ];
# arelle-gui is useless without gui dependencies, so delete it when !gui.
postInstall =
lib.optionalString (!gui) ''
find $out/bin -name "*arelle-gui*" -delete
''
+
# By default, not the entirety of the src dir is copied. This means we don't
# copy the `images` dir, which is needed for the gui version.
lib.optionalString (gui) ''
targetDir=$out/${python.sitePackages}
cp -vr $src/arelle $targetDir
'';
optional-dependencies = {
crypto = [ pycryptodome ];
db = [
pg8000
pymysql
pyodbc
rdflib
];
efm = [
holidays
pytz
];
esef = [ tinycss2 ];
objectmaker = [ graphviz ];
webserver = [
cheroot
cherrypy
tornado
];
};
# Documentation
postBuild = ''
(cd apidocs && make html && cp -r _build $doc)
nativeBuildInputs = [
# deps for docs
sphinxHook
sphinx-autodoc2
myst-parser
sphinx-copybutton
furo
];
# the arelleGUI executable doesn't work when the gui option is false
postInstall = lib.optionalString (!gui) ''
find $out/bin -name "*arelleGUI*" -delete
'';
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
boto3
] ++ lib.flatten (lib.attrValues optional-dependencies);
checkPhase = ''
py.test
preCheck = ''
export HOME=$(mktemp -d)
'';
meta = with lib; {
description =
''
An open source facility for XBRL, the eXtensible Business Reporting
Language supporting various standards, exposed through a Python or
REST API''
+ lib.optionalString gui " and a graphical user interface";
disabledTestPaths =
[
"tests/integration_tests"
]
++ lib.optionals (!gui) [
# these tests import tkinter
"tests/unit_tests/arelle/test_updater.py"
"tests/unit_tests/arelle/test_import.py"
];
meta = {
description = "Open source XBRL platform";
longDescription = ''
An open source facility for XBRL, the eXtensible Business Reporting
Language supporting various standards, exposed through a Python or
REST API ${lib.optionalString gui " and a graphical user interface"}.
'';
mainProgram = "arelle";
homepage = "http://arelle.org/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ roberth ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
tomasajt
roberth
];
};
}

View File

@ -1,14 +0,0 @@
diff --git c/arelle/CntlrProfiler.py i/arelle/CntlrProfiler.py
index a64bb1b..dc0299d 100644
--- c/arelle/CntlrProfiler.py
+++ i/arelle/CntlrProfiler.py
@@ -1,5 +1,6 @@
-import Cntlr, ModelManager, FileSource, time
+from arelle import Cntlr, ModelManager, FileSource
+import time
from optparse import OptionParser
import cProfile
import gettext
diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
index 12dbbbb..c0e98c3 100644

View File

@ -52,7 +52,7 @@
buildPythonPackage rec {
pname = "chromadb";
version = "0.5.17";
version = "0.5.18";
pyproject = true;
disabled = pythonOlder "3.9";
@ -61,13 +61,13 @@ buildPythonPackage rec {
owner = "chroma-core";
repo = "chroma";
rev = "refs/tags/${version}";
hash = "sha256-ui4wUV9jIvgPtnY5L8mHg9k3l3ccL4u1rir426wwuMg=";
hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-lF+TpoQF6vZoxjPX3CN6TnWiY72qoxrVu2hilWgNx2E=";
hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w=";
};
pythonRelaxDeps = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.126";
version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
hash = "sha256-clS7O0WVY9jtuG1RF8c+14nlN9/U/29fEtVNnmGslQU=";
hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail

View File

@ -18,14 +18,14 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.126";
version = "9.2.127";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO0=";
hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1=";
};
in
buildPythonPackage rec {
@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
hash = "sha256-aOt5ba/F05FMiH+HpTVHOD2sfQY/yFoO9A90MZlF7So=";
hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0=";
};
build-system = [ setuptools ];

View File

@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
setuptools,
dissononce,
python-axolotl-curve25519,
transitions,
@ -14,14 +15,14 @@
buildPythonPackage rec {
pname = "consonance";
version = "0.1.5";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tgalal";
repo = "consonance";
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
};
@ -34,7 +35,15 @@ buildPythonPackage rec {
})
];
propagatedBuildInputs = [
env = {
# make protobuf compatible with old versions
# https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
};
build-system = [ setuptools ];
dependencies = [
dissononce
python-axolotl-curve25519
transitions
@ -47,10 +56,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "consonance" ];
meta = with lib; {
meta = {
description = "WhatsApp's handshake implementation using Noise Protocol";
homepage = "https://github.com/tgalal/consonance";
license = licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
maintainers = [ ];
};
}

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
version = "2.9.9";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
rev = "refs/tags/v${version}";
hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs=";
hash = "sha256-aTFas+3+veky+pyz2T1SytMNGwxlF9dAc3E03PKqvrM=";
};
build-system = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.28";
version = "0.5.29";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-TAPuP0VFhKuWDzko/+Upq6GDGZJO9y6GuuV6GsSqi2I=";
hash = "sha256-sV5V+D0K02qmP9Z0WqYSvNsKTeXkdrY9CsRtvYq1JcE=";
};
build-system = [ setuptools ];

View File

@ -1,4 +1,5 @@
{
stdenv,
lib,
buildPythonPackage,
fetchFromGitHub,
@ -13,18 +14,23 @@
buildPythonPackage rec {
pname = "mirakuru";
version = "2.5.2";
version = "2.5.3";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ClearcodeHQ";
repo = "mirakuru";
rev = "refs/tags/v${version}";
hash = "sha256-I1TKP0ESuBMTcReZf0tryjvGpSpwzofwmOiQqhyr6Zg=";
hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ=";
};
patches = [
# https://github.com/ClearcodeHQ/mirakuru/pull/810
./tmpdir.patch
];
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ psutil ];
@ -37,6 +43,20 @@ buildPythonPackage rec {
];
pythonImportsCheck = [ "mirakuru" ];
# Necessary for the tests to pass on Darwin with sandbox enabled.
__darwinAllowLocalNetworking = true;
# Those are failing in the darwin sandbox with:
# > ps: %mem: requires entitlement
# > ps: vsz: requires entitlement
# > ps: rss: requires entitlement
# > ps: time: requires entitlement
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
"test_forgotten_stop"
"test_mirakuru_cleanup"
"test_daemons_killing"
];
meta = with lib; {
homepage = "https://pypi.org/project/mirakuru";
description = "Process orchestration tool designed for functional and integration tests";

View File

@ -0,0 +1,19 @@
--- a/tests/executors/test_unixsocket_executor.py
+++ b/tests/executors/test_unixsocket_executor.py
@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the
``netcat-openbsd`` package is used, not ``netcat-traditional``.
"""
+import os
import sys
import pytest
@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired
from mirakuru.unixsocket import UnixSocketExecutor
from tests import TEST_SOCKET_SERVER_PATH
-SOCKET_PATH = "/tmp/mirakuru.sock"
+SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock")
SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}"

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
version = "1.11.0";
version = "1.12.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-SBQ99NJFVwsqyExadw/jvToeZuUzi7+/wQxS8YMwrNM=";
hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g=";
};
build-system = [ flit-core ];

View File

@ -150,8 +150,8 @@ rec {
"sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0=";
mypy-boto3-autoscaling =
buildMypyBoto3Package "autoscaling" "1.35.53"
"sha256-cknZ2hZ8hV7gnOqBD6XWxrJZS7j3B4TiP29y6QBGCoQ=";
buildMypyBoto3Package "autoscaling" "1.35.56"
"sha256-UmJt7Yp7Nf5M/PV6c077GMYVdKbFT9XGV/o6Y7HSbs0=";
mypy-boto3-autoscaling-plans =
buildMypyBoto3Package "autoscaling-plans" "1.35.0"
@ -166,8 +166,8 @@ rec {
"sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI=";
mypy-boto3-batch =
buildMypyBoto3Package "batch" "1.35.53"
"sha256-1qJvWSYN94rV8xiIOoGO5FVKl2Q1hcLfooOfMYEp5M0=";
buildMypyBoto3Package "batch" "1.35.57"
"sha256-1tWJD780ioswhtdCB1ETlRwEVExCJbwjtLcDg1x/HG0=";
mypy-boto3-billingconductor =
buildMypyBoto3Package "billingconductor" "1.35.0"
@ -194,8 +194,8 @@ rec {
"sha256-BAHAhOT7WanSavOe4iNVeJ0I4+QW2Ymn6C915sTQbwU=";
mypy-boto3-chime-sdk-media-pipelines =
buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.0"
"sha256-eXgK8DJugHC1r9qPVK5ajdr/ppDnfxBHxB0tSld0icw=";
buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.57"
"sha256-VmHywaRFz8GJW/wde6ULj6iDfMH8+qDcoH6FamN77Dg=";
mypy-boto3-chime-sdk-meetings =
buildMypyBoto3Package "chime-sdk-meetings" "1.35.0"
@ -210,8 +210,8 @@ rec {
"sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
mypy-boto3-cleanrooms =
buildMypyBoto3Package "cleanrooms" "1.35.51"
"sha256-InSA/7IwpeCcIaPa/S+a3l+POGmcL1O5RG+ANPFfqrE=";
buildMypyBoto3Package "cleanrooms" "1.35.56"
"sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI=";
mypy-boto3-cloud9 =
buildMypyBoto3Package "cloud9" "1.35.0"
@ -266,8 +266,8 @@ rec {
"sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";
mypy-boto3-codebuild =
buildMypyBoto3Package "codebuild" "1.35.49"
"sha256-KsO/4MFJA3J53FMrbodO8bIw8FV3PmwZOaADxoo5bjI=";
buildMypyBoto3Package "codebuild" "1.35.55"
"sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas=";
mypy-boto3-codecatalyst =
buildMypyBoto3Package "codecatalyst" "1.35.0"
@ -470,8 +470,8 @@ rec {
"sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8=";
mypy-boto3-eks =
buildMypyBoto3Package "eks" "1.35.45"
"sha256-Dl9pCZc5WX6HC0LbXznGrpSc32KtPvHNMFD9Ru8Ay6k=";
buildMypyBoto3Package "eks" "1.35.57"
"sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8=";
mypy-boto3-elastic-inference =
buildMypyBoto3Package "elastic-inference" "1.35.38"
@ -534,8 +534,8 @@ rec {
"sha256-KQqb3NdsN8SloK7kIbJoy5I3zhO5CUr9rB8ZqtVLaDc=";
mypy-boto3-firehose =
buildMypyBoto3Package "firehose" "1.35.0"
"sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM=";
buildMypyBoto3Package "firehose" "1.35.57"
"sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM=";
mypy-boto3-fis =
buildMypyBoto3Package "fis" "1.35.12"
@ -594,8 +594,8 @@ rec {
"sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
mypy-boto3-guardduty =
buildMypyBoto3Package "guardduty" "1.35.39"
"sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE=";
buildMypyBoto3Package "guardduty" "1.35.55"
"sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA=";
mypy-boto3-health =
buildMypyBoto3Package "health" "1.35.0"
@ -766,12 +766,12 @@ rec {
"sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk=";
mypy-boto3-lakeformation =
buildMypyBoto3Package "lakeformation" "1.35.0"
"sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU=";
buildMypyBoto3Package "lakeformation" "1.35.55"
"sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM=";
mypy-boto3-lambda =
buildMypyBoto3Package "lambda" "1.35.49"
"sha256-7TPYB348lSMXAxZuDR2uhGCyUA6zqFiKDvBQuh3M5uE=";
buildMypyBoto3Package "lambda" "1.35.57"
"sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc=";
mypy-boto3-lex-models =
buildMypyBoto3Package "lex-models" "1.35.0"
@ -1042,8 +1042,8 @@ rec {
"sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw=";
mypy-boto3-pinpoint-sms-voice-v2 =
buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.43"
"sha256-Wiue58JJyi8Td4H+byVkmjUEkuZdM4zeyJ4CAwk/+Z8=";
buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.57"
"sha256-pjvecs9LfkOQXiobtZ/OQVMKXGl/ATMy7ZiRjNJFclQ=";
mypy-boto3-pipes =
buildMypyBoto3Package "pipes" "1.35.43"
@ -1074,8 +1074,8 @@ rec {
"sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs=";
mypy-boto3-quicksight =
buildMypyBoto3Package "quicksight" "1.35.43"
"sha256-rcIdJWamEYS6M/aLO9oLe2vwyipzNra5cIrt1pFWn5Y=";
buildMypyBoto3Package "quicksight" "1.35.56"
"sha256-wiAo7FwQYo4oL8qiE3KOlpeuo4uOCacLZwBf5vel88M=";
mypy-boto3-ram =
buildMypyBoto3Package "ram" "1.35.0"
@ -1114,8 +1114,8 @@ rec {
"sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ=";
mypy-boto3-resource-explorer-2 =
buildMypyBoto3Package "resource-explorer-2" "1.35.25"
"sha256-49Ysavsq6tDUQAcJiP4GQkt5zgBz36qufByA88bltco=";
buildMypyBoto3Package "resource-explorer-2" "1.35.56"
"sha256-b6H2qsCgpX9j7yWWtPTV2CcPbtXit4HLaCH8YwAJH1A=";
mypy-boto3-resource-groups =
buildMypyBoto3Package "resource-groups" "1.35.30"
@ -1166,8 +1166,8 @@ rec {
"sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA=";
mypy-boto3-s3control =
buildMypyBoto3Package "s3control" "1.35.12"
"sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g=";
buildMypyBoto3Package "s3control" "1.35.55"
"sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc=";
mypy-boto3-s3outposts =
buildMypyBoto3Package "s3outposts" "1.35.0"
@ -1346,8 +1346,8 @@ rec {
"sha256-72VjJGOWAphFUZfMxzSaYyycUtoL1St08G/SAEhDriQ=";
mypy-boto3-synthetics =
buildMypyBoto3Package "synthetics" "1.35.18"
"sha256-p/jKkj4a1vUkgfmUAkKY6nbDKKaBNAJeuFOea7Uvq7M=";
buildMypyBoto3Package "synthetics" "1.35.56"
"sha256-QRYicbaZ/2a7aXB42v9WrHR56O4A+4eEnoaoo7OMaGc=";
mypy-boto3-textract =
buildMypyBoto3Package "textract" "1.35.0"
@ -1378,8 +1378,8 @@ rec {
"sha256-j9ZU1UHzKNo1+gb+uUYiMTIwjGi9OEg0jAmKGx+mGno=";
mypy-boto3-verifiedpermissions =
buildMypyBoto3Package "verifiedpermissions" "1.35.30"
"sha256-wOoPXyHx/yCdGtLFLFyO9WJLSx0XyIiwMWMLff3v25U=";
buildMypyBoto3Package "verifiedpermissions" "1.35.55"
"sha256-ptQXmGLaWRtOqAL3iunKubP5gQHHAezQAubG3Z3m6BI=";
mypy-boto3-voice-id =
buildMypyBoto3Package "voice-id" "1.35.0"

View File

@ -20,6 +20,9 @@ buildPythonPackage rec {
unittestCheckHook
postgresql
];
unittestFlagsArray = [ "test" ];
propagatedBuildInputs = [ postgresql ];
meta = with lib; {

View File

@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pymc";
rev = "refs/tags/v${version}";
hash = "sha256-XJWAzJ8B5MZlMA6gF8OAUeXUHfPH2/buvoGlthgc+Qw=";
hash = "sha256-rH6sh05rSrhakcfdc+BSR37kQYO/QEPuw8hHMZZGwdE=";
};
postPatch = ''

View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "pyosmium";
version = "4.0.1";
version = "4.0.2";
pyproject = true;
disabled = pythonOlder "3.7" || isPyPy;
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "osmcode";
repo = "pyosmium";
rev = "refs/tags/v${version}";
hash = "sha256-qi4GsjQVe2nIcvQThAlxQu3kUdWhRuJFHVPjKbMBxdM=";
hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM=";
};
build-system = [ setuptools ];

View File

@ -2,22 +2,34 @@
lib,
buildPythonPackage,
fetchPypi,
fetchpatch,
setuptools,
}:
buildPythonPackage rec {
pname = "python-axolotl-curve25519";
version = "0.4.1.post2";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3";
};
meta = with lib; {
patches = [
# https://github.com/tgalal/python-axolotl-curve25519/pull/26
(fetchpatch {
url = "https://github.com/tgalal/python-axolotl-curve25519/commit/901f4fb12e1290b72fbd26ea1f40755b079fa241.patch";
hash = "sha256-hdhaOysRXI9q5D9e/bfy0887bpEFSvUyrbl32nBgteQ=";
})
];
build-system = [ setuptools ];
meta = {
homepage = "https://github.com/tgalal/python-axolotl-curve25519";
description = "Curve25519 with ed25519 signatures";
maintainers = with maintainers; [ abbradar ];
license = licenses.gpl3;
maintainers = with lib.maintainers; [ abbradar ];
license = lib.licenses.gpl3;
};
}

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.126";
version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
hash = "sha256-bi4DKqT+MFLCJgVN+EegED0d6XbUuZ2GS/vsHU6FMgw=";
hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o=";
};
build-system = [ setuptools ];

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "redis-om";
version = "0.3.2";
version = "0.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "redis";
repo = "redis-om-python";
rev = "refs/tags/v${version}";
hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw=";
hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg=";
};
build-system = [

View File

@ -0,0 +1,72 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
flit-core,
astroid,
typing-extensions,
typer,
pytestCheckHook,
pytest-regressions,
sphinx,
defusedxml,
}:
buildPythonPackage rec {
pname = "sphinx-autodoc2";
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "sphinx-extensions2";
repo = "sphinx-autodoc2";
rev = "refs/tags/v${version}";
hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI=";
};
build-system = [ flit-core ];
dependencies = [
astroid
typing-extensions
# cli deps
typer
] ++ typer.optional-dependencies.standard;
preCheck = ''
# make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
substituteInPlace tests/test_render.py --replace-fail \
'from sphinx.testing.util import path as sphinx_path' \
'sphinx_path = Path'
'';
nativeCheckInputs = [
pytestCheckHook
pytest-regressions
sphinx
defusedxml
];
disabledTests = [
# some generated files differ in newer versions of Sphinx
"test_sphinx_build_directives"
];
pythonImportsCheck = [ "autodoc2" ];
meta = {
changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/v${version}";
homepage = "https://github.com/sphinx-extensions2/sphinx-autodoc2";
description = "Sphinx extension that automatically generates API documentation for your Python packages";
license = lib.licenses.mit;
mainProgram = "autodoc2";
maintainers = with lib.maintainers; [ tomasajt ];
};
}

View File

@ -35,7 +35,7 @@
removeReferencesTo,
# Build inputs
darwin,
apple-sdk_13,
numactl,
# dependencies
@ -364,6 +364,9 @@ buildPythonPackage rec {
# NB technical debt: building without NNPACK as workaround for missing `six`
USE_NNPACK = 0;
# Explicitly enable MPS for Darwin
USE_MPS = setBool stdenv.hostPlatform.isDarwin;
cmakeFlags =
[
# (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true)
@ -519,9 +522,7 @@ buildPythonPackage rec {
++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Accelerate
darwin.apple_sdk.frameworks.CoreServices
darwin.libobjc
apple-sdk_13
]
++ lib.optionals tritonSupport [ _tritonEffective ]
++ lib.optionals MPISupport [ mpi ]

View File

@ -15,6 +15,9 @@ buildPythonPackage rec {
hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A=";
};
# https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19
env.GITHUB_REF = "refs/tags/${version}";
build-system = [
setuptools
];

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "wtforms";
version = "3.1.2";
version = "3.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "wtforms";
repo = "wtforms";
rev = "refs/tags/${version}";
hash = "sha256-L6DmB7iVpJR775oRxuEkCKWlUJnmw8VPZTr2dZbqeEc=";
hash = "sha256-jwjP/wkk8MdNJbPE8MlkrH4DyR304Ju41nN4lMo3jFs=";
};
nativeBuildInputs = [

View File

@ -26,13 +26,19 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tgalal";
repo = "yowsup";
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
};
pythonRelaxDeps = true;
pythonRemoveDeps = [ "argparse" ];
env = {
# make protobuf compatible with old versions
# https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
@ -45,11 +51,11 @@ buildPythonPackage rec {
six
] ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ];
meta = with lib; {
meta = {
homepage = "https://github.com/tgalal/yowsup";
description = "Python WhatsApp library";
mainProgram = "yowsup-cli";
license = licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
maintainers = [ ];
};
}

View File

@ -1,7 +1,7 @@
{ lib, swiftPackages, fetchFromGitHub }:
let
inherit (swiftPackages) apple_sdk stdenv swift;
inherit (swiftPackages) stdenv swift;
arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
in
stdenv.mkDerivation rec {
@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ swift ];
buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ];
makeFlags = [ "openwith_${arch}" ];
installPhase = ''

View File

@ -1,19 +1,20 @@
{ lib
, fetchFromGitHub
, buildHomeAssistantComponent
, moonraker-api
{
lib,
fetchFromGitHub,
buildHomeAssistantComponent,
moonraker-api,
}:
buildHomeAssistantComponent rec {
owner = "marcolivierarsenault";
domain = "moonraker";
version = "1.3.7";
version = "1.4.0";
src = fetchFromGitHub {
owner = "marcolivierarsenault";
repo = "moonraker-home-assistant";
rev = "refs/tags/${version}";
hash = "sha256-Mz78wCBP3U1CWbr3KajZ5RjQOIqhjFvmL9Walx+xxzQ=";
hash = "sha256-wdbomvpRvadWjxi8c6D9dhdXmWnSuVxmEPZCX8WmC5M=";
};
propagatedBuildInputs = [

View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.28.1";
version = "11.29.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-XbufLkszKqddqBrYrUHzQLUT+kzLaRo60f0D1mRmwRA=";
hash = "sha256-a8ihlnJ8fggJpr54GGlNLgWwM6veW5xz4ah5WkFHHh0=";
};
proxyVendor = true;
vendorHash = "sha256-0XA3kDOY2PLczv9wlbeXzFe7UDNI5FQo4Q7bV1nsprA=";
vendorHash = "sha256-snnEqg41Vi82uoFzJzYg8/P45lp0Y4w1NQ0rG0CD+T0=";
subPackages = [ "apps/cnspec" ];

View File

@ -15018,6 +15018,8 @@ self: super: with self; {
sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { };
sphinx-autodoc2 = callPackage ../development/python-modules/sphinx-autodoc2 { };
sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { };
sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };