Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-10-06 12:05:15 +00:00 committed by GitHub
commit 5c3e5ec59f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
96 changed files with 4513 additions and 3096 deletions

View File

@ -17701,6 +17701,12 @@
githubId = 145816;
name = "David McKay";
};
rayhem = {
email = "glosser1@gmail.com";
github = "rayhem";
githubId = 49202382;
name = "Connor Glosser";
};
raylas = {
email = "r@raymond.sh";
github = "raylas";

View File

@ -437,6 +437,8 @@
- `zx` was updated to v8, which introduces several breaking changes.
See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.
- `feishin` removed support for Navidrome `< v0.53.2` due to an API change; more information in the [v0.10.0 release notes](https://github.com/jeffvli/feishin/releases/tag/v0.10.0).
- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.
To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*`

View File

@ -1071,7 +1071,7 @@ in
'';
};
"memcached" = {
servers."unix:/run//memcached/memcached.sock" = {};
servers."unix:/run/memcached/memcached.sock" = {};
};
};
};

View File

@ -6,12 +6,12 @@
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.100";
version = "2.0.104";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0=";
hash = "sha256-Hs21Okf0gt8eHTuGMW8L2ioW+hv7QDFOP4oJDQfRba0=";
};
pythonRelaxDeps = true;

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "praat";
version = "6.4.20";
version = "6.4.21";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${finalAttrs.version}";
hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk=";
hash = "sha256-2OeipesVdonv1XACbt9o99M9bxzxE0WQzCU2KWJmuzQ=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -17,13 +17,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "stable2407-2";
version = "stable2409";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-${version}";
hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw=";
hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.

View File

@ -9,16 +9,16 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2024.1.2.13"; # "Android Studio Koala Feature Drop | 2024.1.2 Patch 1"
sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s=";
version = "2024.2.1.9"; # "Android Studio Ladybug | 2024.2.1"
sha256Hash = "sha256-18ppVeAvxx6kNBOjSKcZjbEMNt8khKmohMq3JErX7pY=";
};
betaVersion = {
version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1"
sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4=";
};
latestVersion = {
version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4"
sha256Hash = "sha256-Rw+smKU2F11ZpK6lWb3VyLGTKt3qWFoUqnfcs5OXBcU=";
version = "2024.2.2.5"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 5"
sha256Hash = "sha256-LlGjk0dSHVI5u/b942S5iu4RHv1D4KWg2Ge1TL47pvg=";
};
in {
# Attributes are named by their corresponding release channels

View File

@ -1,17 +1,18 @@
{ lib, buildPythonApplication, fetchFromGitHub
, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
, pygobject3, pyyaml
, pygobject3, pyyaml, setuptools
}:
buildPythonApplication rec {
pname = "rednotebook";
version = "2.34";
version = "2.35";
pyproject = true;
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "refs/tags/v${version}";
sha256 = "sha256-2Z9zYfMAJPcKN5eakooIv4lQ140yjgQuUVlaWcsEu28=";
sha256 = "sha256-sGwdZZ3YGm3sXJoxnYwj6HQcYMnC1pEzba3N9KLfRHM=";
};
# We have not packaged tests.
@ -19,6 +20,8 @@ buildPythonApplication rec {
nativeBuildInputs = [ gobject-introspection ];
build-system = [ setuptools ];
propagatedBuildInputs = [
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
pygobject3 pyyaml
@ -30,6 +33,8 @@ buildPythonApplication rec {
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
];
pythonImportsCheck = [ "rednotebook" ];
meta = with lib; {
homepage = "https://rednotebook.sourceforge.io/";
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";

View File

@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jupyter";
publisher = "ms-toolsai";
version = "2024.9.0";
hash = "sha256-44L7K8JGpmKmH3aoNCalse8QRKJ/2wvA76gs0Z18zpc=";
version = "2024.9.1";
hash = "sha256-7ZNTIymw0LiM5TmDOxrwcyJGhxjdYuvaC4+Tb+YSASs=";
};
nativeBuildInputs = [

View File

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "1.27.0";
version = "1.34.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-v8tcnndAP4+1cRWW2LmAsmSIvALdeESuuv2QmRQhq/s=";
hash = "sha256-Ymd3X6qvdYENbjb2F0ajjb1j0tuy835W6YWCeuvLoXc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.12.5";
version = "1.12.6";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
hash = "sha256-j6/x0fITP6FbI7LvaaB+Dwg9ewFjZ/eqjG0TzQeDsmI=";
hash = "sha256-FwVB1okxhWTzWlZljGEEH9KuSsJl9GmwnX7bn4iDx/M=";
};
ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorHash = "sha256-sSsLs3EedStYlMYKFXIMdNHtrG8ijyu9+2MCYjjzZR4=";
vendorHash = "sha256-Zv393gchMaJzdHFp6U0PDlsk+yIg2t5X3nsgK48TW5A=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

View File

@ -2,7 +2,7 @@
let
versions =
if stdenv.hostPlatform.isLinux then {
stable = "0.0.67";
stable = "0.0.70";
ptb = "0.0.105";
canary = "0.0.492";
development = "0.0.28";
@ -17,7 +17,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-L8COdPP4SFRO+1mipjn4tjLR+xShcJbT/72yhNHdSWg=";
hash = "sha256-Ujlewrhbqal97hCG6+Iu+OqntWZJ/oY6ZHeL+HmoU38=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

View File

@ -2,11 +2,11 @@
let
pname = "jbrowse";
version = "2.15.1";
version = "2.15.4";
src = fetchurl {
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
sha256 = "sha256-/dpHUrigO0wnWay0jIkg6eG75ynrVXd7zcIAss6DhSs=";
sha256 = "sha256-ojIvC93dx9BSnUw7zBpDMBD0xPCMG4GUH1e5ZRGd9pk=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cryptoverif";
version = "2.10";
version = "2.11";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz";
hash = "sha256-Gg7PYMB5cYWk9+xuxxcFY9L9vynHX2xYyMDo/0DauPM=";
hash = "sha256-duc7t0Qpr1Z2FZEoufdQ7kcBlLbXHO+r9ivEgUxqK9s=";
};
/* Fix up the frontend to load the 'default' cryptoverif library

View File

@ -172,20 +172,9 @@ buildPythonApplication rec {
# skip failing tests due to darwin sandbox
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
# can be re-enabled with the next kitty release, see https://github.com/kovidgoyal/kitty/pull/7939
substituteInPlace kitty_tests/file_transmission.py \
--replace test_file_get dont_test_file_get \
--replace test_path_mapping_receive dont_test_path_mapping_receive \
--replace test_transfer_send dont_test_transfer_send
substituteInPlace kitty_tests/shell_integration.py \
--replace test_fish_integration dont_test_fish_integration
substituteInPlace kitty_tests/shell_integration.py \
--replace test_bash_integration dont_test_bash_integration
substituteInPlace kitty_tests/open_actions.py \
--replace test_parsing_of_open_actions dont_test_parsing_of_open_actions
substituteInPlace kitty_tests/ssh.py \
--replace test_ssh_connection_data dont_test_ssh_connection_data
substituteInPlace kitty_tests/fonts.py \
--replace 'class Rendering(BaseTest)' 'class Rendering'
# theme collection test starts an http server
rm tools/themes/collection_test.go
# passwd_test tries to exec /usr/bin/dscl

View File

@ -1,21 +1,30 @@
{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytestCheckHook, pytest-cov-stub, pytest-mock, setuptools }:
buildPythonApplication rec {
pname = "pass-git-helper";
version = "2.0.0";
version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "languitar";
repo = "pass-git-helper";
rev = "refs/tags/v${version}";
sha256 = "sha256-IpMaCG6kPNrWtcl10Lh7A3PyIF4Mk0t2wLYON+zMLsE=";
sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g=";
};
propagatedBuildInputs = [ pyxdg ];
nativeCheckInputs = [ pytest pytest-mock ];
preCheck = ''
export HOME=$(mktemp -d)
'';
build-system = [ setuptools ];
dependencies = [ pyxdg ];
env.HOME = "$TMPDIR";
pythonImportsCheck = [ "passgithelper" ];
nativeCheckInputs = [
pytestCheckHook
pytest-cov-stub
pytest-mock
];
meta = with lib; {
homepage = "https://github.com/languitar/pass-git-helper";

View File

@ -8,6 +8,7 @@
alsa-lib,
asio,
curl,
libremidi,
nlohmann_json,
obs-studio,
opencv,
@ -16,12 +17,17 @@
stdenv,
tesseract,
websocketpp,
xorg,
httplib,
libremidi,
libXScrnSaver,
}:
let
httplib-src = fetchFromGitHub {
owner = "yhirose";
repo = "cpp-httplib";
rev = "v0.17.3";
hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
};
in
stdenv.mkDerivation rec {
pname = "advanced-scene-switcher";
version = "1.27.2";
@ -50,13 +56,13 @@ stdenv.mkDerivation rec {
qtbase
tesseract
websocketpp
xorg.libXScrnSaver
libXScrnSaver
];
dontWrapQtApps = true;
postUnpack = ''
cp -r ${httplib.src}/* $sourceRoot/deps/cpp-httplib
cp -r ${httplib-src}/* $sourceRoot/deps/cpp-httplib
cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
chmod -R +w $sourceRoot/deps/cpp-httplib
chmod -R +w $sourceRoot/deps/libremidi

View File

@ -1,62 +0,0 @@
{ lib
, stdenv
, fetchurl
, runCommand
, shaka-packager
}:
let
sources = {
"x86_64-linux" = {
filename = "packager-linux-x64";
hash = "sha256-MoMX6PEtvPmloXJwRpnC2lHlT+tozsV4dmbCqweyyI0=";
};
aarch64-linux = {
filename = "packager-linux-arm64";
hash = "sha256-6+7SfnwVRsqFwI7/1F7yqVtkJVIoOFUmhoGU3P6gdQ0=";
};
x86_64-darwin = {
filename = "packager-osx-x64";
hash = "sha256-fFBtOp/Zb37LP7TWAEB0yp0xM88cMT9QS59EwW4MrAY=";
};
};
source = sources."${stdenv.hostPlatform.system}"
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation (finalAttrs: {
pname = "shaka-packager";
version = "2.6.1";
src = fetchurl {
url = "https://github.com/shaka-project/shaka-packager/releases/download/v${finalAttrs.version}/${source.filename}";
inherit (source) hash;
};
dontUnpack = true;
sourceRoot = ".";
installPhase = ''
runHook preInstall
install -m755 -D $src $out/bin/packager
runHook postInstall
'';
passthru.tests = {
simple = runCommand "${finalAttrs.pname}-test" { } ''
${shaka-packager}/bin/packager -version | grep ${finalAttrs.version} > $out
'';
};
meta = {
description = "Media packaging framework for VOD and Live DASH and HLS applications";
homepage = "https://shaka-project.github.io/shaka-packager/html/";
license = lib.licenses.bsd3;
mainProgram = "packager";
maintainers = [ ];
platforms = builtins.attrNames sources;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.28.1";
version = "1.29.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ=";
sha256 = "sha256-th5nNOU4GBw82Bq+Ybv/JtFY5d/aimgm0vkBgnMScdQ=";
};
cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50=";
cargoHash = "sha256-6x6NSy9f74Snlqsk0zPiTPXoML3zzcQUEyNLV8P+ggk=";
# skip test due FHS dependency
doCheck = false;

View File

@ -17,14 +17,14 @@
python3Packages.buildPythonApplication rec {
pname = "alpaca";
version = "2.0.5";
version = "2.0.6";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Alpaca";
rev = "refs/tags/${version}";
hash = "sha256-BLLcU2GESyHGFJJicE42V3nMFf/YfnYsXcAOPIHuCAg=";
hash = "sha256-4c6pisd3o7mycivHd1QZ2N7s8pYzrQXiZMbVvl5ciPA=";
};
nativeBuildInputs = [

View File

@ -5,11 +5,11 @@
let
pname = "arduino-ide";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage";
hash = "sha256-M7JKfld6DRk4hxih5MufAhW9kJ+ePDrBhE+oXFc8dYw=";
hash = "sha256-VJGO3X1PUKE0OLr5PKH5uTE3rX0SlyrD6vdYdFdzHxk=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@ -58,6 +58,7 @@ rustPlatform.buildRustPackage rec {
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p "$out/bin"
ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''

View File

@ -6,14 +6,14 @@
}:
python3Packages.buildPythonApplication {
pname = "exo";
version = "0-unstable-2024-10-03";
version = "0-unstable-2024-10-06";
pyproject = true;
src = fetchFromGitHub {
owner = "exo-explore";
repo = "exo";
rev = "2b9dec20eb25f8708455e13eabc744d653b7a286";
hash = "sha256-Iz65bs/ntTrxcifrPemAlK8zVjbwQfXsnUlcE1r4E/A=";
rev = "7b2a523fd1e5f1281d89bc1f664a29dc2003b787";
hash = "sha256-o4tNbU9oa7WsAQ6eiTHqQVhliXbG/Y8d7PeH2TTWgGk=";
};
build-system = with python3Packages; [ setuptools ];
@ -34,11 +34,11 @@ python3Packages.buildPythonApplication {
jinja2
netifaces
numpy
nvidia-ml-py
pillow
prometheus-client
protobuf
psutil
pynvml
requests
rich
safetensors

View File

@ -47,13 +47,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.26.1";
version = "2.27.1";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
rev = finalAttrs.version;
hash = "sha256-0TRhMK45mfCft56R07lUbnxjfQrIAXONy4f6ykpc5X8=";
hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4=";
};
outputs = [

View File

@ -11,13 +11,13 @@
}:
let
pname = "feishin";
version = "0.9.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "jeffvli";
repo = "feishin";
rev = "v${version}";
hash = "sha256-3gQ39GhYPme0kGAtM5DsG9RYwf23OAdkp3uVt7c1SQU=";
hash = "sha256-YdtGhGcG5qVoVa1534NQIbI02gy0pzR9U1PU2lL1u/A=";
};
electron = electron_31;
@ -26,7 +26,7 @@ buildNpmPackage {
inherit pname version;
inherit src;
npmDepsHash = "sha256-u+zbPB6u9EYVr9oHnLlKC0AyCLn4nq4TFVPSs2oWsbo=";
npmDepsHash = "sha256-3fY0NCswRTnpDDsr1fDK9YZm8TUKCIMJ1+yw38dj0M8=";
npmFlags = [ "--legacy-peer-deps" ];
makeCacheWritable = true;
@ -60,7 +60,7 @@ buildNpmPackage {
inherit version;
src = "${src}/release/app";
npmDepsHash = "sha256-3qUmXRiAloGgLAErR16+BGEUT0ZwHHhCxMDQRCENQB4=";
npmDepsHash = "sha256-YkLT69QU7WMGRe95rfZ8TmnfIdWwtpWaqGY+wU48veQ=";
npmFlags = [ "--ignore-scripts" ];
dontNpmBuild = true;

View File

@ -1,33 +1,38 @@
{ lib
, stdenv
, buildNpmPackage
, fetchFromGitHub
, python3
, xcbuild
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
python3,
xcbuild,
}:
buildNpmPackage rec {
pname = "firebase-tools";
version = "13.18.0";
let
version = "13.20.2";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
rev = "v${version}";
hash = "sha256-Tis5bF1rVuvjSuMeoa5ayyuZXdwolkNL3Ct+IWeYOKc=";
rev = "refs/tags/v${version}";
hash = "sha256-FIflfCSTXm7J2WectS175vc0ccztWa4tE2E2kcbhwJg=";
};
in
buildNpmPackage {
pname = "firebase-tools";
inherit version src;
npmDepsHash = "sha256-mQYetHLbxr3Jegz01BfFVdzcLuz46zcNVqXjjxdKM/E=";
npmDepsHash = "sha256-qEerq6rFBN6HmzDS4xQJorzmzapBV/WhzCwG3rHU458=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';
nativeBuildInputs = [
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild
];
nativeBuildInputs =
[
python3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild
];
env = {
PUPPETEER_SKIP_DOWNLOAD = true;
@ -39,6 +44,6 @@ buildNpmPackage rec {
homepage = "https://github.com/firebase/firebase-tools";
license = lib.licenses.mit;
mainProgram = "firebase";
maintainers = [ ];
maintainers = with lib.maintainers; [ momeemt ];
};
}

View File

@ -0,0 +1,36 @@
{
lib,
cmake,
fetchFromGitHub,
openssl,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "httplib";
version = "0.18.0";
src = fetchFromGitHub {
owner = "yhirose";
repo = "cpp-httplib";
rev = "v${finalAttrs.version}";
hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];
strictDeps = true;
meta = {
homepage = "https://github.com/yhirose/cpp-httplib";
description = "C++ header-only HTTP/HTTPS server and client library";
changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
AndersonTorres
];
platforms = lib.platforms.all;
};
})

View File

@ -6,6 +6,7 @@
rustPlatform,
testers,
lazyjj,
fetchpatch,
}:
rustPlatform.buildRustPackage rec {
pname = "lazyjj";
@ -25,6 +26,15 @@ rustPlatform.buildRustPackage rec {
--prefix PATH : ${lib.makeBinPath [ jujutsu ]}
'';
patches = [
# https://github.com/Cretezy/lazyjj/pull/61
(fetchpatch {
name = "adapt_test_traces_to_jj_0.22.0.patch";
url = "https://github.com/Cretezy/lazyjj/commit/d5e949fb0e62bc93969c27011963582e12bbe3f6.patch";
hash = "sha256-u+IMLW4iZxMmpa+dwggMfQ4E7ygc0T4I6lvzBcPJT3s=";
})
];
nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = [ jujutsu ];

View File

@ -1,44 +1,58 @@
{ alsa-lib
, cmake
, CoreAudio
, CoreFoundation
, CoreMIDI
, CoreServices
, fetchFromGitHub
, lib
, stdenv
{
lib,
alsa-lib,
cmake,
darwin,
fetchFromGitHub,
stdenv,
}:
stdenv.mkDerivation rec {
let
inherit (darwin.apple_sdk.frameworks)
CoreAudio
CoreFoundation
CoreMIDI
CoreServices
;
in
stdenv.mkDerivation (finalAttrs: {
pname = "libremidi";
version = "4.4.0";
src = fetchFromGitHub {
owner = "jcelerier";
repo = "libremidi";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg=";
};
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreAudio
CoreFoundation
CoreMIDI
CoreServices
nativeBuildInputs = [
cmake
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreAudio
CoreFoundation
CoreMIDI
CoreServices
];
# Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher
strictDeps = false;
postInstall = ''
cp -r $src/include $out
'';
meta = {
description = "Modern C++ MIDI real-time & file I/O library";
homepage = "https://github.com/jcelerier/libremidi";
maintainers = [ ];
description = "Modern C++ MIDI real-time & file I/O library";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
}
})

View File

@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0089ee..eb1b1c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,13 +459,20 @@ endif()
# webm_parser headers are rooted at webm/.
set_target_properties(webm PROPERTIES PUBLIC_HEADER
"${webm_parser_public_headers}")
+target_include_directories(webm INTERFACE $<INSTALL_INTERFACE:include/webm>)
install(
TARGETS webm
+ EXPORT webmConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm)
+install(EXPORT webmConfig
+ FILE webmConfig.cmake
+ NAMESPACE webm::
+ DESTINATION lib/cmake/webm)
+
# Install common headers into a subdirectory to avoid breaking nested includes.
install(FILES ${libwebm_common_public_headers}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/common)

View File

@ -0,0 +1,49 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libwebm";
version = "1.0.0.31";
src = fetchFromGitHub {
owner = "webmproject";
repo = "libwebm";
rev = "refs/tags/libwebm-${finalAttrs.version}";
hash = "sha256-+ayX33rcX/jkewsW8WrGalTe9X44qFBHOrIYTteOQzc=";
};
patches = [
# libwebm does not generate cmake exports by default,
# which are necessary to find and use it as build-dependency
# in other packages
./0001-cmake-exports.patch
];
nativeBuildInputs = [
cmake
];
outputs = [
"dev"
"out"
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "WebM file parser";
homepage = "https://www.webmproject.org/code/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ niklaskorz ];
platforms = lib.platforms.all;
};
})

View File

@ -69,13 +69,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "3829";
version = "3887";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-ZveUZ3/aCLC/m9YugnKWpPp6S6wQXkHfVkUkXhJIKAg=";
hash = "sha256-uyZ/uyuLzXAeZ8TQK8e6+zf+ZTFRSJJ1Doqw8Cd10+A=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"version": "2.3.0",
"integrity": "sha512-IDJpIF15g64t4ooSJzR/teqiqT4lQJ2ezdz9bI9LJiXVPU9nOQcXtvaJlGzNgTsK9C+0mNc0a6qSK9MI25A0tA==",
"filename": "mongosh-2.3.0.tgz",
"deps": "sha256-C7SNmFxbk6rgnoe93cAx6dAYhRAm5VqpwlNqEDdS0jY="
"version": "2.3.1",
"integrity": "sha512-Xl6HYKgrdKtmwMB7oa04cowOQmUf/kjMUfdCh/IJaF+2NKPaXPw7bPlEcxHOXSc/7jAZe9gtAbkurqkHqE39hg==",
"filename": "mongosh-2.3.1.tgz",
"deps": "sha256-ets4hJ1+BtL0BQFTzNSvfvbpbHc1dIIOviOi4PTA65U="
}

View File

@ -0,0 +1,36 @@
{
lib,
buildGo123Module,
fetchFromGitHub,
}:
buildGo123Module rec {
pname = "nak";
version = "0.7.6";
src = fetchFromGitHub {
owner = "fiatjaf";
repo = "nak";
rev = "refs/tags/v${version}";
hash = "sha256-VUSBCvDW53Z+mdAx0bUQIgcsiEwxOnm/FnnMcSC0iks=";
};
vendorHash = "sha256-alex1YEkviR5O0KLGZlOsf1i7s6m1C4LxHdJCogDCng=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
# Integration tests fail (requires connection to relays)
doCheck = false;
meta = {
description = "Command-line tool for Nostr things";
homepage = "https://github.com/fiatjaf/nak";
changelog = "https://github.com/fiatjaf/nak/releases/tag/${version}";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ nartsiss ];
mainProgram = "nak";
};
}

File diff suppressed because it is too large Load Diff

View File

@ -13,21 +13,23 @@
rustPlatform.buildRustPackage rec {
pname = "pixi";
version = "0.27.1";
version = "0.31.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
rev = "v${version}";
hash = "sha256-37zVmPKAWCw58xA5lUb+WVAW8rRwPF7DZVXUZ8bwP5E=";
hash = "sha256-1Woi+HwlN1nP05/cMNj+FVqEVREy/+UivdWGD6lZSNY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
"cache-key-0.0.1" = "sha256-tg3zRakZsnf7xBjs5tSlkmhkhHp5HGs6dwrTmdZBTl4=";
"pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M=";
"async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
"cache-key-0.0.1" = "sha256-JEGcX4dT/cVLb07n2Y0nai17jW0tXpV18qaYVnoEpew=";
"pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c=";
"reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ=";
"tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ=";
};
};
@ -48,46 +50,8 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = 1;
};
# There are some CI failures with Rattler. Tests on Aarch64 has been skipped.
# See https://github.com/prefix-dev/pixi/pull/241.
doCheck = !stdenv.hostPlatform.isAarch64;
preCheck = ''
export HOME="$(mktemp -d)"
'';
checkFlags = [
# Skip tests requiring network
"--skip=add_channel"
"--skip=add_functionality"
"--skip=add_functionality_os"
"--skip=add_functionality_union"
"--skip=add_pypi_functionality"
"--skip=add_with_channel"
"--skip=test_alias"
"--skip=test_cwd"
"--skip=test_compressed_mapping_catch_missing_package"
"--skip=test_compressed_mapping_catch_not_pandoc_not_a_python_package"
"--skip=test_dont_record_not_present_package_as_purl"
"--skip=test_incremental_lock_file"
"--skip=test_purl_are_added_for_pypi"
"--skip=test_purl_are_generated_using_custom_mapping"
"--skip=test_purl_are_missing_for_non_conda_forge"
# `/usr/bin/env` is not available during build.
# Error: /usr/bin/env: No such file or directory
"--skip=test_clean_env"
"--skip=test_full_env_activation"
"--skip=test_task_with_env"
"--skip=test_pixi_only_env_activation"
"--skip=cli::shell_hook::tests::test_environment_json"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"--skip=task::task_environment::tests::test_find_ambiguous_task"
"--skip=task::task_environment::tests::test_find_task_dual_defined"
"--skip=task::task_environment::tests::test_find_task_explicit_defined"
"--skip=task::task_graph::test::test_custom_command"
"--skip=task::task_graph::test::test_multi_env_defaults_ambigu"
];
# As the version is updated, the number of failed tests continues to grow.
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd pixi \

View File

@ -1,19 +1,19 @@
{
"version": "5.0.21",
"version": "5.0.22",
"darwin-amd64": {
"hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz"
"hash": "sha256-2pMflIUyFWUUe7wXMawIlSqf1S/w7is75yzli26p+LM=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_darwin_all.tar.gz"
},
"darwin-arm64": {
"hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz"
"hash": "sha256-2pMflIUyFWUUe7wXMawIlSqf1S/w7is75yzli26p+LM=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_darwin_all.tar.gz"
},
"linux-amd64": {
"hash": "sha256-O6systY+fRhyDu/clXfuQB6lv2HgzoIe2ku4MwgrQoI=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_amd64.tar.gz"
"hash": "sha256-j/aInQwN3K3pfXzIkDE6pA/6nc7TSndWZkFFdqlsJW4=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_linux_amd64.tar.gz"
},
"linux-arm64": {
"hash": "sha256-tGUXrq96zSEp5VHXeaQdmZdUera/NrMOQxTT8CznJlA=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_arm64.tar.gz"
"hash": "sha256-xZ3i7KG/NdoHD6kB3Mtq1jC2BufhcxWXhodD8FQvIpI=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/platform_5.0.22_linux_arm64.tar.gz"
}
}

View File

@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
[[package]]
name = "addr2line"
version = "0.24.1"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
version = "1.1.24"
version = "1.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
checksum = "677207f6eaec43fcfd092a718c847fc38aa261d0e19b8ef6797e0ccbe789e738"
dependencies = [
"shlex",
]
@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "els"
version = "0.1.58-nightly.1"
version = "0.1.58-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eed2c90d92d8be15be9e928f06d34e0cfe03c8c10e6351326859cecf3789dcac"
checksum = "82ca64c7e007a801f3c026026d4f7c65193ca2ccfab19018cf47b0946ed1de86"
dependencies = [
"erg_common",
"erg_compiler",
@ -159,9 +159,9 @@ dependencies = [
[[package]]
name = "erg_common"
version = "0.6.46-nightly.1"
version = "0.6.46-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4758c25017a49a7f3d8cb3287360deae39c696936a6747cf9e3d9f81cb94c010"
checksum = "c91d7308be743f27d0bcb6778d85d76bfad86fc54ae53ae5fab06b37bd54fd74"
dependencies = [
"backtrace-on-stack-overflow",
"erg_proc_macros",
@ -172,9 +172,9 @@ dependencies = [
[[package]]
name = "erg_compiler"
version = "0.6.46-nightly.1"
version = "0.6.46-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c5c7fad1c74774dcbc293b79bb62a024135fcde4faf13411a3490761cb71a98"
checksum = "a2ca9d5eb0b29b60d7ac8d7d639add33a4b331b35e4739775f0bd0f1e94be764"
dependencies = [
"erg_common",
"erg_parser",
@ -182,9 +182,9 @@ dependencies = [
[[package]]
name = "erg_parser"
version = "0.6.46-nightly.1"
version = "0.6.46-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c564e2914429af720277cb61256362762790da8c635558f77c4d6ae4c3a64f3a"
checksum = "f0d0f70495239bd721afb1be7ba33c9146cbd7d4d578bd65fcb86e52561224e0"
dependencies = [
"erg_common",
"erg_proc_macros",
@ -193,9 +193,9 @@ dependencies = [
[[package]]
name = "erg_proc_macros"
version = "0.6.46-nightly.1"
version = "0.6.46-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fac38f9d18406130093186708186dad6f59efc04b0eddc0a8d0364be9361a90"
checksum = "61073a06b84b2e9c36b3645494102780936b560ba80f8c466cf2cdc374740f3e"
dependencies = [
"quote",
"syn 1.0.109",
@ -232,9 +232,9 @@ dependencies = [
[[package]]
name = "gimli"
version = "0.31.0"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "hashbrown"
@ -455,21 +455,18 @@ dependencies = [
[[package]]
name = "object"
version = "0.36.4"
version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
version = "1.20.1"
version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
dependencies = [
"portable-atomic",
]
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "parking_lot"
@ -544,12 +541,6 @@ dependencies = [
"siphasher",
]
[[package]]
name = "portable-atomic"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "ppv-lite86"
version = "0.2.20"
@ -570,7 +561,7 @@ dependencies = [
[[package]]
name = "py2erg"
version = "0.0.64"
version = "0.0.65"
dependencies = [
"erg_common",
"erg_compiler",
@ -580,7 +571,7 @@ dependencies = [
[[package]]
name = "pylyzer"
version = "0.0.64"
version = "0.0.65"
dependencies = [
"els",
"erg_common",
@ -590,7 +581,7 @@ dependencies = [
[[package]]
name = "pylyzer_core"
version = "0.0.64"
version = "0.0.65"
dependencies = [
"erg_common",
"erg_compiler",
@ -601,7 +592,7 @@ dependencies = [
[[package]]
name = "pylyzer_wasm"
version = "0.0.64"
version = "0.0.65"
dependencies = [
"erg_common",
"erg_compiler",

View File

@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.64";
version = "0.0.65";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
hash = "sha256-ShH394FgmuDrArIvz+okVJKWffVVFhsuVWaWFquW2GU=";
hash = "sha256-pHFsrC5SefXEnxgIk/OkRdOOAuYZLhZYVYu41MYtxJs=";
};
cargoLock = {

View File

@ -1,24 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
, nodejs
, python3
, runtimeShell
, stdenv
, testers
, runme
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
nodejs,
python3,
runtimeShell,
stdenv,
testers,
runme,
}:
buildGoModule rec {
pname = "runme";
version = "3.7.1";
version = "3.8.3";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-b1HP5JCtQFA0+GIkMswb8o3k9zbD5sLrLR7yz8UivLk=";
hash = "sha256-AnGh1Kg3CV4UkEwZ81QMeIf9whdeCglmCbfp8DC6N30=";
};
vendorHash = "sha256-qOM66jiSjAU5e6eGrM8kgJxWJzxwgHpLadx5pTjNFOs=";
@ -52,7 +53,7 @@ buildGoModule rec {
doCheck = !stdenv.hostPlatform.isDarwin;
postPatch = ''
substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \
substituteInPlace testdata/{flags/fmt,prompts/basic,runall/basic,script/basic,tags/categories}.txtar \
--replace-fail /bin/bash "${runtimeShell}"
'';

View File

@ -0,0 +1,32 @@
From e243cc17f48c5e1b8db29cab85ca98b033d972fb Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 4 Sep 2024 14:51:30 +0200
Subject: [PATCH 1/3] Allow external declaration of packager version
---
packager/version/CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/packager/version/CMakeLists.txt b/packager/version/CMakeLists.txt
index fba4fb8282..ad56e0a23b 100644
--- a/packager/version/CMakeLists.txt
+++ b/packager/version/CMakeLists.txt
@@ -4,6 +4,7 @@
# license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd
+if(NOT DEFINED PACKAGER_VERSION)
execute_process(
COMMAND "${Python3_EXECUTABLE}" generate_version_string.py
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -14,6 +15,7 @@ execute_process(
if(NOT STATUS EQUAL 0)
message(FATAL_ERROR "Failed to generate Packager version")
endif()
+endif()
add_library(version STATIC version.cc)
target_compile_definitions(version PRIVATE
--
2.46.0

View File

@ -0,0 +1,67 @@
From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 4 Sep 2024 14:52:23 +0200
Subject: [PATCH 2/3] Unvendor dependencies
---
CMakeLists.txt | 24 ++++++++++++++++++++++++
packager/CMakeLists.txt | 1 -
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b96a2429e..181df0bf2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@
# Minimum CMake version. This must be in the root level CMakeLists.txt.
cmake_minimum_required(VERSION 3.24)
+set(CMAKE_CXX_STANDARD 17)
+
# These policy settings should be included before the project definition.
include("packager/policies.cmake")
@@ -28,6 +30,28 @@ enable_testing()
option(SKIP_INTEGRATION_TESTS "Skip the packager integration tests" OFF)
+find_package(absl REQUIRED)
+find_package(MbedTLS REQUIRED)
+find_package(GTest REQUIRED)
+find_package(CURL REQUIRED)
+find_package(LibXml2 REQUIRED)
+find_package(PNG REQUIRED)
+find_package(nlohmann_json REQUIRED)
+find_package(Protobuf CONFIG REQUIRED)
+find_package(webm REQUIRED)
+
+# Alias to same names as vendored dependencies
+add_library(mbedtls ALIAS MbedTLS::mbedtls)
+add_library(gmock ALIAS GTest::gmock)
+add_library(gtest ALIAS GTest::gtest)
+add_library(gtest_main ALIAS GTest::gtest_main)
+add_library(libcurl ALIAS CURL::libcurl)
+add_library(LibXml2 ALIAS LibXml2::LibXml2)
+add_library(png_static ALIAS PNG::PNG) # not static but the expected library name
+add_library(libprotobuf ALIAS protobuf::libprotobuf)
+add_executable(protoc ALIAS protobuf::protoc)
+add_library(webm ALIAS webm::webm)
+
# Subdirectories with their own CMakeLists.txt
add_subdirectory(packager)
add_subdirectory(link-test)
diff --git a/packager/CMakeLists.txt b/packager/CMakeLists.txt
index 7238d243bb..722217bbc4 100644
--- a/packager/CMakeLists.txt
+++ b/packager/CMakeLists.txt
@@ -78,7 +78,6 @@ add_subdirectory(media)
add_subdirectory(hls)
add_subdirectory(mpd)
add_subdirectory(status)
-add_subdirectory(third_party)
add_subdirectory(tools)
add_subdirectory(utils)
add_subdirectory(version)
--
2.46.0

View File

@ -0,0 +1,25 @@
From c8b0b467a140d8a67157f5cee26a8510444706be Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 4 Sep 2024 14:52:47 +0200
Subject: [PATCH 3/3] Fix curl deprecations
---
packager/file/http_file.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
index b50fef6f07..dca43e26ca 100644
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {
curl_easy_setopt(curl, CURLOPT_POST, 1L);
break;
case HttpMethod::kPut:
- curl_easy_setopt(curl, CURLOPT_PUT, 1L);
+ curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
break;
}
--
2.46.0

View File

@ -0,0 +1,107 @@
{
lib,
stdenv,
fetchFromGitHub,
testers,
cmake,
ninja,
python3,
nix-update-script,
abseil-cpp,
curl,
gtest,
nlohmann_json,
libpng,
libxml2,
libwebm,
mbedtls,
mimalloc,
protobuf,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "shaka-packager";
version = "3.2.0";
src = fetchFromGitHub {
owner = "shaka-project";
repo = "shaka-packager";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-L10IMsc4dTMa5zwYq612F4J+uKOmEEChY8k/m09wuNE=";
};
patches = [
# By default, the git commit hash and tag are used as version
# and shaka-packager fails to build if these are not available.
# This patch makes it possible to pass an external value as version.
# The value itself is declared further below in `cmakeFlags`.
./0001-Allow-external-declaration-of-packager-version.patch
# Dependencies are vendored as git submodules inside shaka-packager.
# We want to reuse the dependencies from nixpkgs instead to avoid unnecessary
# build overhead and to ensure they are up to date.
# This patch disables the vendored dependencies (by excluding `third-party`),
# finds them inside the build environment and aliases them so they can be accessed
# without prefixing namespaces.
# The last step is necessary to keep the patch size to a minimum, otherwise we'd have
# to add the namespace identifiers everywhere a dependency is used.
./0002-Unvendor-dependencies.patch
# As nixpkgs ships with a newer version of libcurl than the one vendored in shaka-packager,
# we have to fix one deprecation.
# See https://curl.se/libcurl/c/CURLOPT_PUT.html for further information.
./0003-Fix-curl-deprecations.patch
];
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
python3
abseil-cpp
curl
gtest
nlohmann_json
libpng
libxml2
libwebm
mbedtls
mimalloc
(protobuf.override {
# must be the same version as for shaka-packager
inherit abseil-cpp;
})
zlib
];
cmakeFlags = [
"-DPACKAGER_VERSION=v${finalAttrs.version}-nixpkgs"
# Targets are selected below in ninjaFlags
"-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON"
];
ninjaFlags = [
"mpd_generator"
"packager"
"pssh_box_py"
];
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
version = "v${finalAttrs.version}-nixpkgs-release";
};
};
meta = with lib; {
description = "Media packaging framework for VOD and Live DASH and HLS applications";
homepage = "https://shaka-project.github.io/shaka-packager/html/";
changelog = "https://github.com/shaka-project/shaka-packager/releases/tag/v${finalAttrs.version}";
license = licenses.bsd3;
mainProgram = "packager";
maintainers = with maintainers; [ niklaskorz ];
platforms = platforms.all;
};
})

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "smbclient-ng";
version = "2.1.5";
version = "2.1.6";
pyproject = true;
src = fetchFromGitHub {
owner = "p0dalirius";
repo = "smbclient-ng";
rev = "refs/tags/${version}";
hash = "sha256-5ObqmCvMoBuQOPbQATrIVzxnxrJtvB+iUJSS7sqs6hI=";
hash = "sha256-T1OAiRL7AGMz12dFIPOESS77lVd62iaBt9vXCdzqJBQ=";
};
pythonRelaxDeps = [

View File

@ -1,19 +1,19 @@
{
"version": "5.0.21",
"version": "5.0.22",
"darwin-amd64": {
"hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz"
"hash": "sha256-miO8KOxlr+x5wFOAfkMsgE9R3mz7nMjMAFxWd8/O1bE=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_darwin_all.tar.gz"
},
"darwin-arm64": {
"hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz"
"hash": "sha256-miO8KOxlr+x5wFOAfkMsgE9R3mz7nMjMAFxWd8/O1bE=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_darwin_all.tar.gz"
},
"linux-amd64": {
"hash": "sha256-1qbgXI3VtYoI/4EWPZ1jmWBVJEP+A60PIqXS38wnBPQ=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_amd64.tar.gz"
"hash": "sha256-R/G2w7spHifYr5voFPDvFyl3eooNxW8nwo0WlpfqIN8=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_linux_amd64.tar.gz"
},
"linux-arm64": {
"hash": "sha256-pUdRvVtEokuf7gznUogyufTtloy4MuT5TMcJ4z1bcwo=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_arm64.tar.gz"
"hash": "sha256-1qcM2J0nBCgqredDbgNgU9Si/aP677Fq0scS5W3+beE=",
"url": "https://github.com/platformsh/cli/releases/download/5.0.22/upsun_5.0.22_linux_arm64.tar.gz"
}
}

View File

@ -16,16 +16,16 @@
buildNpmPackage rec {
pname = "vscode-js-debug";
version = "1.93.0";
version = "1.94.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vscode-js-debug";
rev = "v${version}";
hash = "sha256-8+ZoTddzgwLwPUduT+G5zVgt/ZxLWKojz1PKvOxLX6o=";
hash = "sha256-Mh4g0YBgZ3u0zLwfzbcc1/24dsgq/7l9fu/KdurhLks=";
};
npmDepsHash = "sha256-4GTZevbQg1LhxVw6WQYGvWHVuaWTwpCf50gMZWAHE7c=";
npmDepsHash = "sha256-s+kulnn4yE2rNPtm2MYJ36kFZStYgjePc7zdX7FwrNk=";
nativeBuildInputs = [
pkg-config

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "cozette";
version = "1.25.1";
version = "1.25.2";
src = fetchzip {
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip";
hash = "sha256-Cnl7DTPcZmCRM06qe7WXfZorok3uUNYcB9bR/auzCao=";
hash = "sha256-LtZHbsma9EuegS349gQo4W+ZT8x+Vb3CD/5vRKjwkzc=";
};
installPhase = ''

View File

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "25.0.0";
version = "25.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-3SircJsg/SFyPfIYLHiwXqkQAHXocnUyPYsMRnGaxsA=";
hash = "sha256-l0tkEV4roec3xK57oXV49ofNdpuZ+hCuzde6YazYPZc=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-CvHrZYZVAY2ff3fSBDMeucOru6NkRRQPILBAC/YjfTA=";
cargoHash = "sha256-0pt3wZlhLuN0E6f6AU0uC0qmkuII2OXxUTChuzQjvqI=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];

View File

@ -1,30 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, openssl
}:
stdenv.mkDerivation rec {
pname = "httplib";
version = "0.17.3";
src = fetchFromGitHub {
owner = "yhirose";
repo = "cpp-httplib";
rev = "v${version}";
hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];
meta = with lib; {
description = "C++ header-only HTTP/HTTPS server and client library";
homepage = "https://github.com/yhirose/cpp-httplib";
changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}";
maintainers = with maintainers; [ aidalgol ];
license = licenses.mit;
platforms = platforms.all;
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openxr-loader";
version = "1.1.40";
version = "1.1.41";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenXR-SDK-Source";
rev = "release-${version}";
sha256 = "sha256-dKSQqiZtnxKj9arpxm9vwz8WzKBXh6y6vzZ9uHP7vX0=";
sha256 = "sha256-D6FTslMdnqLTQrI1E6Ts5PwkrqhQo/uOfp9CsChoneU=";
};
nativeBuildInputs = [ cmake python3 pkg-config ];

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "4.0.3";
version = "4.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = "aioswitcher";
rev = "refs/tags/${version}";
hash = "sha256-QSnroxVHlfZd6QDaqUTMyoctiEsxWmGmFxzql1YIAD0=";
hash = "sha256-iWEmKyg20qCww/Q+HjOj4Owp26xgY1kXQHVkmxFPfr4=";
};
__darwinAllowLocalNetworking = true;

View File

@ -6,7 +6,6 @@
pythonOlder,
pytestCheckHook,
setuptools,
wheel,
numpy,
pandas,
}:
@ -14,7 +13,8 @@
buildPythonPackage rec {
pname = "ancp-bids";
version = "0.2.4";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
# `tests/data` dir missing from PyPI dist
@ -25,19 +25,7 @@ buildPythonPackage rec {
hash = "sha256-c6X1gCYAezgZQP6xfQPfKW8V35F1cnTdbryEp3sZ4jw=";
};
patches = [
# https://github.com/ANCPLabOldenburg/ancp-bids/pull/78
(fetchpatch {
name = "unpin-wheel-build-dependency.patch";
url = "https://github.com/ANCPLabOldenburg/ancp-bids/commit/6e7a0733002845aacb0152c5aacfb42054a9b65e.patch";
hash = "sha256-WbQRwb8Wew46OJu+zo7n4qBtgtH/Lr6x3YHAyN9ko9M=";
})
];
nativeBuildInputs = [
setuptools
wheel
];
build-system = [ setuptools ];
nativeCheckInputs = [
numpy
@ -54,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://ancpbids.readthedocs.io";
description = "Read/write/validate/query BIDS datasets";
changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

View File

@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
requests,
}:
buildPythonPackage rec {
pname = "biothings-client";
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "biothings";
repo = "biothings_client.py";
rev = "v${version}";
hash = "sha256-rCpzBX2H+7R8ulnJgtVlBA45ASa4DaY5jQ1bO2+bAC8=";
};
build-system = [ setuptools ];
dependencies = [ requests ];
pythonImportsCheck = [ "biothings_client" ];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
# All other tests make network requests to exercise the API
"tests/gene.py::TestGeneClient::test_http"
"tests/test.py::TestBiothingsClient::test_generate_settings_from_url"
"tests/variant.py::TestVariantClient::test_format_hgvs"
];
meta = {
changelog = "https://github.com/biothings/biothings_client.py/blob/v${version}/CHANGES.txt";
description = "Wrapper to access Biothings.api-based backend services";
homepage = "https://github.com/biothings/biothings_client.py";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ rayhem ];
};
}

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bleak-esphome";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = "bleak-esphome";
rev = "refs/tags/v${version}";
hash = "sha256-zz7vh+UIahHtb6ZjR/eRrS9RGur2klqbgKoeJpMrH/k=";
hash = "sha256-+84ODCx2XzREhSSt5Uu0+Bj55bfU+i33qf3wFMwu3wA=";
};
postPatch = ''

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "cytoolz";
version = "0.12.3";
version = "1.0.0";
pyproject = true;
disabled = isPy27 || isPyPy;
src = fetchPypi {
inherit pname version;
hash = "sha256-RQPcWfTO1TpUZDJyxh3DBdHbv719a98paUjenzTDooI=";
hash = "sha256-60U7MBghUvmRelGJt9mQRrbOkM34rrD+/0smg+YA3v0=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,46 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
setuptools-scm,
django,
django-ipware,
pytestCheckHook,
pytest-cov-stub,
pytest-django,
}:
buildPythonPackage rec {
pname = "django-axes";
version = "7.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-axes";
rev = version;
hash = "sha256-xcA5PN8gznY6BQwHXT42WcOLnIlUACRh33zOlsCpRHE=";
};
build-system = [ setuptools-scm ];
dependencies = [ django ];
nativeCheckInputs = [
django-ipware
pytestCheckHook
pytest-cov-stub
pytest-django
];
env.DJANGO_SETTINGS_MODULE = "tests.settings";
pythonImportsCheck = [ "axes" ];
meta = {
description = "Keep track of failed login attempts in Django-powered sites";
homepage = "https://github.com/jazzband/django-axes";
maintainers = with lib.maintainers; [ sikmir ];
license = lib.licenses.mit;
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "django-crispy-bootstrap4";
version = "2024.1";
version = "2024.10";
pyproject = true;
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "crispy-bootstrap4";
rev = "refs/tags/${version}";
hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4=";
hash = "sha256-lBm48krF14WuUMX9lgx9a++UhJWHWPxOhj3R1j4QTOs=";
};
build-system = [ setuptools ];

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "django-crispy-bootstrap5";
version = "2024.2";
version = "2024.10";
pyproject = true;
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "crispy-bootstrap5";
rev = "refs/tags/${version}";
hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0=";
hash = "sha256-p2sc6rajy9A0YNnv1A0wphjm7Kc6HoNf7LM3Gu21PKI=";
};
build-system = [ setuptools ];

View File

@ -0,0 +1,45 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
poetry-core,
django,
pytestCheckHook,
pytest-cov-stub,
}:
buildPythonPackage rec {
pname = "django-split-settings";
version = "1.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "wemake-services";
repo = "django-split-settings";
rev = version;
hash = "sha256-Bk2/DU+K524mCUvteWT0fIQH5ZgeMHiufMTF+dJYVtc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "poetry.masonry" "poetry.core.masonry"
'';
build-system = [ poetry-core ];
dependencies = [ django ];
pythonImportsCheck = [ "split_settings" ];
nativeCheckInputs = [
pytestCheckHook
pytest-cov-stub
];
meta = {
description = "Organize Django settings into multiple files and directories";
homepage = "https://github.com/wemake-services/django-split-settings";
maintainers = with lib.maintainers; [ sikmir ];
license = lib.licenses.bsd3;
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.7.10";
version = "1.7.11";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = "fastcore";
rev = "refs/tags/${version}";
hash = "sha256-ksHJrgNju2rEVHcKU6jpW6izQPFgrWvDrvDZy0/Cgug=";
hash = "sha256-dRAkhTIH2t6W1Ygda4BRHojKYgwTXaHu4KkKqQIzulw=";
};
build-system = [ setuptools ];

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "fyta-cli";
version = "0.6.6";
version = "0.6.7";
pyproject = true;
disabled = pythonOlder "3.11";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "dontinelli";
repo = "fyta_cli";
rev = "refs/tags/v${version}";
hash = "sha256-yuTfrWiGxoiEmQ1zaYM2ZrlrssZ+hCupPxar9SUP4uU=";
hash = "sha256-KdrDRiPpkG8SDPWtGKU7A14WtQuuA4823t47uWHdGko=";
};
build-system = [ hatchling ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.11.10";
version = "0.11.11";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
rev = "refs/tags/v${version}";
hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw=";
hash = "sha256-/jtTNQ9r4JJAXLIEEO7lR0IhpJ5vzbV0mNTdKgkH1FE=";
};
pythonRelaxDeps = [ "hishel" ];

View File

@ -64,7 +64,7 @@
buildPythonPackage rec {
pname = "gradio";
version = "4.44.0";
version = "4.44.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -72,7 +72,7 @@ buildPythonPackage rec {
# We use the Pypi release, since it provides prebuilt webui assets
src = fetchPypi {
inherit pname version;
hash = "sha256-ovjRJ52giPZxVCOv8TuD3kcbgHbDTBqaSBNrrTN1MkE=";
hash = "sha256-popSSYrGtj+IZO+Ev3hmpw59B+vpE+35IeHSo3CK1a4=";
};
# fix packaging.ParserSyntaxError, which can't handle comments

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "httpx-ws";
version = "0.6.0";
version = "0.6.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "frankie567";
repo = "httpx-ws";
rev = "refs/tags/v${version}";
hash = "sha256-eDc21FiGHi98doS4Zbubb/MVw4IjQ1q496TFHCX4xB4=";
hash = "sha256-mynr07px+rQb7x8GepQoUgBbh0720S0K2RJrboOoJXA=";
};
# we don't need to use the hatch-regex-commit plugin

View File

@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "labgrid";
version = "24.0.1";
version = "24.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "labgrid-project";
repo = "labgrid";
rev = "refs/tags/v${version}";
hash = "sha256-KZO6HeB1Kkc3r6OI0ZXIL1WvGLYL5SLxaOn+EX5akOE=";
hash = "sha256-rW9peT4zoPzVR6Kl/E8G4qBig/x/lvxpCtvNtwIIL+U=";
};
build-system = [

View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "manifestoo-core";
version = "1.8";
version = "1.8.1";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "manifestoo_core";
hash = "sha256-AjvwG9j2TILslTR4GwK6eHfql4l7I+QIwUd6XQ2ojmg=";
hash = "sha256-aULT5xxkWEndzEBVcpwvWlIXQYxwfF0VxoI6EHC3JAs=";
};
nativeBuildInputs = [ hatch-vcs ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
version = "1.8.0";
version = "1.9.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-Vud/MaRmY/xmTJXofF8BHpl3TRxfrxlUdX0xDHKpwIA=";
hash = "sha256-9i0AUljcU4dZSNkgqJnKtKobWCSkBGP8vwCbVSbxw/E=";
};
build-system = [ flit-core ];

View File

@ -35,7 +35,9 @@ buildPythonPackage rec {
version = "1.11.2";
pyproject = true;
disabled = pythonOlder "3.8";
# mypy doesn't support python313 yet
# https://github.com/python/mypy/issues/17264
disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
src = fetchFromGitHub {
owner = "python";

View File

@ -0,0 +1,61 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
poetry-core,
cryptography,
fido2,
requests,
tlv8,
pyserial,
protobuf5,
semver,
crcmod,
hidapi,
ecdsa,
}:
buildPythonPackage rec {
pname = "nitrokey";
version = "0.2.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-oWfhy7Mj1UnrC70G7fpkl4q4uG0CdvO0BHwfJYszR30=";
};
disabled = pythonOlder "3.9";
build-system = [ poetry-core ];
dependencies = [
fido2
requests
semver
tlv8
crcmod
cryptography
hidapi
ecdsa
protobuf5
pyserial
];
# no tests
doCheck = false;
pythonImportsCheck = [ "nitrokey" ];
meta = with lib; {
description = "Python SDK for Nitrokey devices";
homepage = "https://github.com/Nitrokey/nitrokey-sdk-py";
changelog = "https://github.com/Nitrokey/nitrokey-sdk-py/releases/tag/v${version}";
license = with licenses; [
asl20
mit
];
maintainers = with maintainers; [ panicgh ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-gitlab";
version = "4.11.1";
version = "4.12.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "python_gitlab";
inherit version;
hash = "sha256-evovnDBhi8Pa7pXSGGoG4c8Yyi+peJDrVf2N3E4zmBI=";
hash = "sha256-jBQKJgOtjv9/yrbz+qv1/Iuquo3vEl6zCaMtaqOiOlY=";
};
build-system = [ setuptools ];

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyttsx3";
version = "2.97";
version = "2.98";
format = "wheel";
src = fetchPypi {
inherit pname version format;
sha256 = "sha256-GM4wZDtnutHZc2H7s6PHyo/MdQ7Y6YrCJuu2I7AeSw8=";
sha256 = "sha256-s/tMpNWuT45oNtaze/X+4P1R0Vf/on+5Bkvm5749o3o=";
dist = "py3";
python = "py3";
};

View File

@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
httpx,
packaging,
pydantic,
typing-extensions,
pytestCheckHook,
pytest-asyncio,
pytest-recording,
respx,
}:
buildPythonPackage rec {
pname = "replicate";
version = "0.34.1";
pyproject = true;
src = fetchFromGitHub {
owner = "replicate";
repo = "replicate-python";
rev = version;
hash = "sha256-DhmuGh0OASd4rBvizf1qx537j4RGs4eVe0jH1BrhZa4=";
};
build-system = [ setuptools ];
dependencies = [
httpx
packaging
pydantic
typing-extensions
];
pythonImportsCheck = [ "replicate" ];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pytest-recording
respx
];
meta = {
description = "Python client for Replicate";
homepage = "https://replicate.com/";
changelog = "https://github.com/replicate/replicate-python/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jokatzke ];
};
}

View File

@ -1,23 +0,0 @@
From 777be9c46c4caed5f3fcde65b70ada4d773f4298 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 24 Aug 2024 11:26:30 -0700
Subject: [PATCH] Unpin setuptools
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index d17d12dc8..6bf1c7a38 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ scalene = "scalene.__main__:main"
[build-system]
build-backend = "setuptools.build_meta"
requires = [
- "setuptools>=65.5.1,<71.0", # Pin to setuptools<71.0 to avoid this bug: https://github.com/pypa/setuptools/issues/4496
+ "setuptools>=65.5.1",
"setuptools_scm>=8",
"wheel",
"cython",
--

View File

@ -10,6 +10,7 @@
numpy,
nvidia-ml-py,
psutil,
pydantic,
pynvml,
pytestCheckHook,
pythonOlder,
@ -38,7 +39,7 @@ in
buildPythonPackage rec {
pname = "scalene";
version = "1.5.44.1";
version = "1.5.45";
pyproject = true;
disabled = pythonOlder "3.9";
@ -46,12 +47,11 @@ buildPythonPackage rec {
owner = "plasma-umass";
repo = "scalene";
rev = "v${version}";
hash = "sha256-XMz+gwiNaKiKplD4kOE1yhcg+dkzjEdDYjW0JsDEMQE=";
hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE=";
};
patches = [
./01-manifest-no-git.patch
./02-pyproject-unpin-setuptools.patch
];
prePatch = ''
@ -74,6 +74,7 @@ buildPythonPackage rec {
jinja2
numpy
psutil
pydantic
pynvml
rich
] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "simpleeval";
version = "0.9.13";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "danthedeckie";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-I1GILYPE6OyotgRe0Ek/iHHv6q9/b/MlcTxMAtfZD80=";
hash = "sha256-Ryi3ZzIPQ0x/rCQFfoXDOjLuE110n/vUbpvt2IX4GyA=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1244";
version = "3.0.1147";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-T6vYefIN57iD/wBy4ZpVXAJyZNHr/faO08VNSDYRs+8=";
hash = "sha256-dqc29D7Zpq7Hkvlx1+CKJop7zRRAXvHBUu4mnUOTpKM=";
};
build-system = [ setuptools ];

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "textual";
version = "0.81.0";
version = "0.82.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "Textualize";
repo = "textual";
rev = "refs/tags/v${version}";
hash = "sha256-IQmpMBuG7K4x1F8GcPBe2juWUqVyE0g5fQLTfZZso/8=";
hash = "sha256-belpoXQ+CkTchK+FjI/Ur8v4cNgzX39xLdNfPCwaU6E=";
};
build-system = [ poetry-core ];

View File

@ -3,7 +3,7 @@
pkgs,
stdenv,
buildPythonPackage,
fetchPypi,
fetchFromGitLab,
setuptools,
cryptography,
pytestCheckHook,
@ -12,12 +12,14 @@
buildPythonPackage rec {
pname = "virt-firmware";
version = "24.4";
version = "24.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-rqhaKDOQEOj6bcRz3qZJ+a4yG1qTC9SUjuxMhZlnmwU=";
src = fetchFromGitLab {
owner = "kraxel";
repo = "virt-firmware";
rev = "refs/tags/v${version}";
hash = "sha256-uVLq4vbnvK1RCA3tpLgwKb/qzysLsOo3p/6gQ2Prmu0=";
};
build-system = [ setuptools ];

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "weblate-language-data";
version = "2024.6";
version = "2024.8";
pyproject = true;
src = fetchPypi {
pname = "weblate_language_data";
inherit version;
hash = "sha256-FGLrjptIqMeKAV/O2H6ZcP+uGcr1ghqIxAHsYnOpVxg=";
hash = "sha256-JwX3mDq6AbWorqc3nYlm1oySvzuu3IV6iBeS0ezx83U=";
};
build-system = [ setuptools ];

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "yalexs-ble";
version = "2.4.3";
version = "2.5.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-e+XTozOStGiYa4VBM/mQfcpYTapKe92OeZPuD5SwSIQ=";
hash = "sha256-I8LasRfV0a13E3ewkIwWEj8Af9BFBs/Xi4O2z8WuyKI=";
};
nativeBuildInputs = [ poetry-core ];

View File

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation rec {
pname = "minizinc-ide";
version = "2.8.5";
version = "2.8.6";
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
hash = "sha256-rE3Mq2lEcO5s4S8RMW7mQyp04gYwKW+e8cWnWqfVq9E=";
hash = "sha256-B164KCY06SQRxv4eD9yuCKyGRRrMZfJRuaQ+OEmQC5k=";
fetchSubmodules = true;
};

View File

@ -1,10 +1,10 @@
{ lib, fetchurl, lilypond }:
lilypond.overrideAttrs (oldAttrs: rec {
version = "2.25.19";
version = "2.25.20";
src = fetchurl {
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
hash = "sha256-gGG4ObmY9PcO0JIKxAagquHS74Elc49SZ/8FDwFfZDU=";
hash = "sha256-q+eVzm68m4FuAvWKB/Zys7stmT9arAQ/+J/q2AvLnbM=";
};
passthru.updateScript = {

View File

@ -1,4 +1,4 @@
{
"version": "4.1.2",
"sha256": "003p0985fr3l09qpw44rhys3dp9zl2bl46vasix18p2cxq0j8sw5"
"version": "4.1.7",
"sha256": "0qnsz1zvjs1ax9p58g5b8bf3xyjg47sskkcb9nfafp6nzfdy0a2w"
}

View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.41.0.8992-8463ad060";
version = "1.41.0.8994-f2c27da23";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz";
sha256 = "118mqmqfpfskqa19869lg9riip64jz0c2jrvnkpdilvzzhy9ngwx";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m";
sha256 = "10nis1hk3fc9bvgiz41x4gmgbzlz2cczz47a2x14liqxmiwqwl3v";
};
outputs = [ "out" "basedb" ];

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.42.20";
version = "1.43.1";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-FbZ1cDzE6JFke3Bccspn/92mGvJzWr2gcoaVmnI0z1g=";
sha256 = "sha256-i+WW8udVjLQGMg0eu03hInfXaLZzVJ4liKE4eQ/KDww=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-Tzu+wbCFoTy282/jxFv1agCWCA0tEA64OlFuji+hptY=";
vendorHash = "sha256-0SvM6I+zGelSUMlbeeqljfzITw0Cnl2BZHJ78n+m5ds=";
proxyVendor = true;
doCheck = false;

View File

@ -2,20 +2,20 @@
buildFishPlugin rec {
pname = "plugin-git";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "jhillyerd";
repo = "plugin-git";
rev = "refs/tags/v${version}";
hash = "sha256-DQLRat7uGoK57g/1x9Y514gtjvDdf9j4Iqnwif8QWVU=";
hash = "sha256-p7vvwisu3mvVOE1DcALbzuGJqWBcE1h71UjaopGdxE0=";
};
meta = with lib; {
meta = {
description = "Git plugin for fish (similar to oh-my-zsh git)";
homepage = "https://github.com/jhillyerd/plugin-git";
changelog = "https://github.com/jhillyerd/plugin-git/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage unsolvedcypher ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage unsolvedcypher ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
version = "5.8.6";
version = "5.8.7";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "sha256-UgJHsniDbfAcohnrYYUUJ4OhL2Fr65kGu26dsw9vYyM=";
sha256 = "sha256-SE+62EODKWcKFpMMbWDw+Dp5b2D/XKbMFiJiD/ObrhU=";
};
nativeBuildInputs = [ pkg-config installShellFiles ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "chisel";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "jpillora";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-lcMIPASzP1u+MYuozczWFkimBS0XPbrvsy1OldPtRsA=";
hash = "sha256-b3r4D/P7D3kfIyMd1s/ntciY04qMrvSTru9+HjAOrnA=";
};
vendorHash = "sha256-+11Pd/QCxoLLkeazmU9/vnPBaB2MZXmx4cEZRDnyRcQ=";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2024-09-16T17-43-14Z";
version = "2024-10-02T08-27-28Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-j9NEeTUP/pkEhywhNasQQzTwUBcUwq+KVEGGB1hzVw0=";
sha256 = "sha256-o+VNWrGV8LvdDbPPiiXCaGgHRZprfL+HOaATfnzDIVg=";
};
vendorHash = "sha256-KNnYxE3kt/eemnhsRf29SZX0Q+ECzdMFVgcmd7uCsyY=";
vendorHash = "sha256-MJsfYCd2VqvJDcWgiJZX1/jcbHQrFQ7TOkskDf0vuSw=";
subPackages = [ "." ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
sha256 = "sha256-DdsBGISKZuqDwSeuy8/73qskP3XoO3QRT7+bkKIJcBU=";
sha256 = "sha256-K3+E3ODXti88wGE3trxZYTKPe7tYfPI85C/5jXea2uw=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "quark-engine";
version = "24.9.1";
version = "24.10.1";
pyproject = true;
src = fetchFromGitHub {
owner = "quark-engine";
repo = "quark-engine";
rev = "refs/tags/v${version}";
hash = "sha256-DmiqsYEdCh9hG5aa41UymW8IDkba4fuCrtM10A0X2Gg=";
hash = "sha256-IfUXn1HqlEJ/5uuQxMr4qExle7tZfa8FBfDWKNZ/JRw=";
};
build-system = with python3.pkgs; [ setuptools ];

View File

@ -11964,8 +11964,6 @@ with pkgs;
rund = callPackage ../development/tools/rund { };
runme = callPackage ../development/tools/misc/runme { };
runzip = callPackage ../tools/archivers/runzip { };
ruplacer = callPackage ../tools/text/ruplacer {
@ -17622,8 +17620,6 @@ with pkgs;
findnewest = callPackage ../development/tools/misc/findnewest { };
firebase-tools = callPackage ../development/tools/firebase-tools { };
flootty = callPackage ../development/tools/flootty { };
fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
@ -19768,8 +19764,6 @@ with pkgs;
hnswlib = callPackage ../development/libraries/hnswlib { };
httplib = callPackage ../development/libraries/httplib { };
icon-lang = callPackage ../development/interpreters/icon-lang { };
libgit2 = callPackage ../development/libraries/libgit2 {
@ -21235,14 +21229,6 @@ with pkgs;
librem = callPackage ../development/libraries/librem { };
libremidi = callPackage ../development/libraries/libremidi {
inherit (darwin.apple_sdk.frameworks)
CoreAudio
CoreFoundation
CoreMIDI
CoreServices;
};
libremines = qt6.callPackage ../games/libremines { };
librelp = callPackage ../development/libraries/librelp { };
@ -31329,7 +31315,9 @@ with pkgs;
mpvScripts = mpv-unwrapped.scripts;
shaka-packager = callPackage ../applications/video/shaka-packager { };
shaka-packager = callPackage ../by-name/sh/shaka-packager/package.nix {
abseil-cpp = abseil-cpp_202401;
};
mpvpaper = callPackage ../tools/wayland/mpvpaper { };

View File

@ -1617,6 +1617,8 @@ self: super: with self; {
biopython = callPackage ../development/python-modules/biopython { };
biothings-client = callPackage ../development/python-modules/biothings-client { };
biplist = callPackage ../development/python-modules/biplist { };
bip-utils = callPackage ../development/python-modules/bip-utils { };
@ -3296,6 +3298,8 @@ self: super: with self; {
django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { };
django-axes = callPackage ../development/python-modules/django-axes { };
django-bootstrap3 = callPackage ../development/python-modules/django-bootstrap3 { };
django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { };
@ -3468,6 +3472,8 @@ self: super: with self; {
django-scopes = callPackage ../development/python-modules/django-scopes { };
django-split-settings = callPackage ../development/python-modules/django-split-settings { };
djangoql = callPackage ../development/python-modules/djangoql { };
django-ranged-response = callPackage ../development/python-modules/django-ranged-response { };
@ -8941,6 +8947,8 @@ self: super: with self; {
nitransforms = callPackage ../development/python-modules/nitransforms { };
nitrokey = callPackage ../development/python-modules/nitrokey { };
niworkflows = callPackage ../development/python-modules/niworkflows { };
nix-kernel = callPackage ../development/python-modules/nix-kernel {
@ -13514,6 +13522,8 @@ self: super: with self; {
repl-python-wakatime = callPackage ../development/python-modules/repl-python-wakatime { };
replicate = callPackage ../development/python-modules/replicate { };
repocheck = callPackage ../development/python-modules/repocheck { };
reportlab = callPackage ../development/python-modules/reportlab { };