Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -179,6 +179,10 @@
|
||||
and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream.
|
||||
The `vscode-langservers-extracted` package is a maintained drop-in replacement.
|
||||
|
||||
- `fetchNextcloudApp` has been rewritten to use `fetchurl` rather than
|
||||
`fetchzip`. This invalidates all existing hashes but you can restore the old
|
||||
behavior by passing it `unpack = true`.
|
||||
|
||||
- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the
|
||||
output by default, to alert users to closure size issues caused by
|
||||
[#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging
|
||||
|
||||
@@ -103,7 +103,7 @@ let
|
||||
initrdBinEnv = pkgs.buildEnv {
|
||||
name = "initrd-bin-env";
|
||||
paths = map getBin cfg.initrdBin;
|
||||
pathsToLink = ["/bin" "/sbin"];
|
||||
pathsToLink = ["/bin"];
|
||||
postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin);
|
||||
};
|
||||
|
||||
@@ -408,7 +408,7 @@ in {
|
||||
fsck = "${cfg.package.util-linux}/bin/fsck";
|
||||
};
|
||||
|
||||
managerEnvironment.PATH = "/bin:/sbin";
|
||||
managerEnvironment.PATH = "/bin";
|
||||
|
||||
contents = {
|
||||
"/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
|
||||
@@ -417,7 +417,7 @@ in {
|
||||
|
||||
"/etc/systemd/system.conf".text = ''
|
||||
[Manager]
|
||||
DefaultEnvironment=PATH=/bin:/sbin
|
||||
DefaultEnvironment=PATH=/bin
|
||||
${cfg.extraConfig}
|
||||
ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}
|
||||
'';
|
||||
@@ -432,9 +432,9 @@ in {
|
||||
"/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then optionalString (!cfg.emergencyAccess) "*" else cfg.emergencyAccess}:::::::";
|
||||
|
||||
"/bin".source = "${initrdBinEnv}/bin";
|
||||
"/sbin".source = "${initrdBinEnv}/sbin";
|
||||
"/sbin".source = "${initrdBinEnv}/bin";
|
||||
|
||||
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
|
||||
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /bin/modprobe";
|
||||
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
|
||||
"/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } ''
|
||||
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
in rec {
|
||||
|
||||
nixos = {
|
||||
inherit (nixos') channel manual options iso_minimal amazonImage dummy;
|
||||
inherit (nixos') channel manual options iso_minimal dummy;
|
||||
tests = {
|
||||
inherit (nixos'.tests)
|
||||
acme
|
||||
@@ -116,7 +116,6 @@ in rec {
|
||||
(map onSupported [
|
||||
"nixos.dummy"
|
||||
"nixos.iso_minimal"
|
||||
"nixos.amazonImage"
|
||||
"nixos.manual"
|
||||
"nixos.tests.acme"
|
||||
"nixos.tests.boot.uefiCdrom"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "taproot-assets";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "taproot-assets";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sTLimar8cDWFl9lwQHYlKFL3CuNcy3p8CVbRjhrH+Dw=";
|
||||
hash = "sha256-aQYVPSDudLK4ZBcBN/wNjVoF/9inOaJRbcyTP6VMdA0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IFzYW5vAtBoUC2ebFYnxS/TojQR4kXxQACNbyn2ZkCs=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.27.1";
|
||||
version = "1.27.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8=";
|
||||
hash = "sha256-CTc6CBAFIxOX5Bd/hy3e65MbWyI2wFn+a6hj4ktuBjo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@ let
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
version = "3.7-DEV2404";
|
||||
version = "3.7-DEV2408";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldenCheetah";
|
||||
repo = "GoldenCheetah";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u2igcnOulgJGZT46/Z3vSsce9mr3VsxkD3mTeQPvUOg=";
|
||||
hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
, commandLineArgs ? ""
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.6.7";
|
||||
appname = "Obsidian";
|
||||
@@ -19,6 +18,7 @@ let
|
||||
description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
|
||||
mainProgram = "obsidian";
|
||||
license = licenses.obsidian;
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ];
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -27,7 +27,7 @@ in writeScript "update-${pname}" ''
|
||||
HOME=`mktemp -d`
|
||||
export GNUPGHOME=`mktemp -d`
|
||||
|
||||
gpg --receive-keys ADD7079479700DCADFDD5337E36D3B13F3D93274
|
||||
curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import -
|
||||
|
||||
tmpfile=`mktemp`
|
||||
url=${baseUrl}
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "128.0b3";
|
||||
version = "129.0b9";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d2519052244dd6d5cad39afcf78e86b17e5f1520f3f182db123997f8d126b048cd6862e92558c8f112224c951f706ccf1ccb2cb19b5221d4a47bc7154f562ab2";
|
||||
sha512 = "f4f9efb640c7db12301b1b7d23b417e6786a9072f617d2e8a1bdbcaaa4d50d6a4d49d06566d3fff7b066b32ad39aeb0dcd003721c110c2add77dbd3d68df6a0c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -64,13 +64,13 @@
|
||||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "128.0b3";
|
||||
version = "129.0b9";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "b1313d35218adac5b81059f605b788188454f064c3192a6bb91a7c7b361fb2e087ac49177c48f23de517551b563489adfc7486bc4e6b95e5ae4aeac49aa5ac97";
|
||||
sha512 = "225c7abd58b7dd1e6c54e4a5172b7dc4ea19f9f90930d6823d15f2f80524f4f910eb4cb7cf3f863722490447ac8f146654ab129ee89766306b4a6992e2706b20";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
rke2Version = "1.28.10+rke2r1";
|
||||
rke2RepoSha256 = "1pbanikvrl6rqrplrpvjc9ym8qq1yrs621gwy99shp0prfw5zvsx";
|
||||
rke2Commit = "b0d0d687d98f4fa015e7b30aaf2807b50edcc5d7";
|
||||
rke2VendorHash = "sha256-iidkTSrrHyW5ZEouzHAWUwCC9nplGz1v/E9bM2lMPeM=";
|
||||
k8sVersion = "v1.28.10";
|
||||
k8sImageTag = "v1.28.10-rke2r1-build20240514";
|
||||
etcdVersion = "v3.5.9-k3s1";
|
||||
rke2Version = "1.28.11+rke2r1";
|
||||
rke2RepoSha256 = "1mkl7mnlsq2j9n610jnr9545hq6ilr5sdg8jxjxjbk9lnmmbvrm1";
|
||||
rke2Commit = "6b12d7a783238b72da8450fa1b6ec587cebb79ed";
|
||||
rke2VendorHash = "sha256-VenNSaa86nbhrFYzXPbj0fxbDlrIu6pxqMo+HPDuUxs=";
|
||||
k8sVersion = "v1.28.11";
|
||||
k8sImageTag = "v1.28.11-rke2r1-build20240619";
|
||||
etcdVersion = "v3.5.13-k3s1";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.29.3-build20240412";
|
||||
dockerizedVersion = "v1.28.10-rke2r1";
|
||||
golangVersion = "go1.21.9";
|
||||
ccmVersion = "v1.29.3-build20240515";
|
||||
dockerizedVersion = "v1.28.11-rke2r1";
|
||||
golangVersion = "go1.21.11";
|
||||
eol = "2024-10-28";
|
||||
}
|
||||
|
||||
@@ -1,8 +1,21 @@
|
||||
{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript
|
||||
{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript, python3, runCommand
|
||||
, branch
|
||||
, withOpenASAR ? false, openasar
|
||||
, withVencord ? false, vencord }:
|
||||
|
||||
let
|
||||
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
|
||||
{
|
||||
pythonInterpreter = "${python3.interpreter}";
|
||||
configDirName = lib.toLower binaryName;
|
||||
meta.mainProgram = "disable-breaking-updates.py";
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
|
||||
substituteAllInPlace $out/bin/disable-breaking-updates.py
|
||||
chmod +x $out/bin/disable-breaking-updates.py
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
|
||||
@@ -18,7 +31,8 @@ stdenv.mkDerivation {
|
||||
|
||||
# wrap executable to $out/bin
|
||||
mkdir -p $out/bin
|
||||
makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}"
|
||||
makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \
|
||||
--run ${lib.getExe disableBreakingUpdates}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -33,6 +47,8 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# make it possible to run disableBreakingUpdates standalone
|
||||
inherit disableBreakingUpdates;
|
||||
updateScript = writeScript "discord-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep common-updater-scripts
|
||||
|
||||
+12
-5
@@ -17,12 +17,19 @@ import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join(
|
||||
os.path.expanduser("~"), ".config"
|
||||
)
|
||||
config_home = {
|
||||
"darwin": os.path.join(os.path.expanduser("~"), "Library", "Application Support"),
|
||||
"linux": os.environ.get("XDG_CONFIG_HOME") or os.path.join(os.path.expanduser("~"), ".config")
|
||||
}.get(sys.platform, None)
|
||||
|
||||
settings_path = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json")
|
||||
settings_path_temp = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json.tmp")
|
||||
if config_home is None:
|
||||
print("[Nix] Unsupported operating system.")
|
||||
sys.exit(1)
|
||||
|
||||
config_dir_name = "@configDirName@".replace(" ", "") if sys.platform == "darwin" else "@configDirName@"
|
||||
|
||||
settings_path = Path(f"{config_home}/{config_dir_name}/settings.json")
|
||||
settings_path_temp = Path(f"{config_home}/{config_dir_name}/settings.json.tmp")
|
||||
|
||||
if os.path.exists(settings_path):
|
||||
with settings_path.open(encoding="utf-8") as settings_file:
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-u5vVM8qLm9m6VMmCV2Q3VrsqorIyOPrFCPXNh1s5mgY=";
|
||||
x86_64-linux = "sha256-KLOI0lG0rZbLS2uiONNlgyCkohzQhytRovAfrjnGuDI=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "10.0.4";
|
||||
version = "10.2.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pD4drDX9jS6X6S2q/GaxODL1zVG++xGerDQiioONHII=";
|
||||
hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, patches ? [ ]
|
||||
, description ? null
|
||||
, homepage ? null
|
||||
, unpack ? true # whether to use fetchzip rather than fetchurl
|
||||
, unpack ? false # whether to use fetchzip rather than fetchurl
|
||||
}:
|
||||
applyPatches ({
|
||||
inherit patches;
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "art";
|
||||
version = "1.22.1";
|
||||
version = "1.23";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "agriggio";
|
||||
repo = "art";
|
||||
rev = version;
|
||||
hash = "sha256-f6SnTvMelJaPGNeGboI34RvWXcJatEi1G6vfAdDFy8A=";
|
||||
hash = "sha256-OB/Rr4rHNJc40o6esNPDRbhN4EPGf2zhlzzM+mBpUUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zbQlmxrvA2rZLEGmhj7MkVP5SmJdhhL9F3wRrB97DJs=";
|
||||
hash = "sha256-uQe+j7EH62SH64z9mTpsR/tiYm4vSMDbAkYRhfkjf68=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gowall";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Achno";
|
||||
repo = "gowall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4h7vRu1aqCGccKx2UiLSFNloqf22QUml4BHkKzzdwYA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jNx4ehew+IBx7M6ey/rT0vb53+9OBVYSEDJv8JWfZIw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd gowall \
|
||||
--bash <($out/bin/gowall completion bash) \
|
||||
--fish <($out/bin/gowall completion fish) \
|
||||
--zsh <($out/bin/gowall completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Achno/gowall/releases/tag/v${version}";
|
||||
description = "Tool to convert a Wallpaper's color scheme / palette";
|
||||
homepage = "https://github.com/Achno/gowall";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gowall";
|
||||
maintainers = with lib.maintainers; [
|
||||
crem
|
||||
emilytrau
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
|
||||
version = "photos-v0.9.5";
|
||||
version = "photos-v0.9.16";
|
||||
pname = "museum";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "server" ];
|
||||
rev = version;
|
||||
hash = "sha256-U+3k6uIJWDw7QxF1GRF+f6ZXdmCwSkOJ/F60rU1PXRM=";
|
||||
hash = "sha256-ZtlwDV3Iksi2QNzoAsAtbN7B/n0UKubU4nlXx4N0l+E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/server";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/music_assistant/server/helpers/audio.py b/music_assistant/server/helpers/audio.py
|
||||
index 42011923..1e5dc112 100644
|
||||
index 6b7b5c8e..ec3b92d7 100644
|
||||
--- a/music_assistant/server/helpers/audio.py
|
||||
+++ b/music_assistant/server/helpers/audio.py
|
||||
@@ -218,7 +218,7 @@ async def crossfade_pcm_parts(
|
||||
@@ -214,7 +214,7 @@ async def crossfade_pcm_parts(
|
||||
await outfile.write(fade_out_part)
|
||||
args = [
|
||||
# generic args
|
||||
@@ -11,7 +11,7 @@ index 42011923..1e5dc112 100644
|
||||
"-hide_banner",
|
||||
"-loglevel",
|
||||
"quiet",
|
||||
@@ -281,7 +281,7 @@ async def strip_silence(
|
||||
@@ -277,7 +277,7 @@ async def strip_silence(
|
||||
) -> bytes:
|
||||
"""Strip silence from begin or end of pcm audio using ffmpeg."""
|
||||
fmt = ContentType.from_bit_depth(bit_depth)
|
||||
@@ -20,16 +20,16 @@ index 42011923..1e5dc112 100644
|
||||
args += [
|
||||
"-acodec",
|
||||
fmt.name.lower(),
|
||||
@@ -823,7 +823,7 @@ async def get_ffmpeg_stream(
|
||||
@@ -824,7 +824,7 @@ async def get_ffmpeg_stream(
|
||||
async def check_audio_support() -> tuple[bool, bool, str]:
|
||||
"""Check if ffmpeg is present (with/without libsoxr support)."""
|
||||
# check for FFmpeg presence
|
||||
- returncode, output = await check_output("ffmpeg -version")
|
||||
+ returncode, output = await check_output("@ffmpeg@ -version")
|
||||
- returncode, output = await check_output("ffmpeg", "-version")
|
||||
+ returncode, output = await check_output("@ffmpeg@", "-version")
|
||||
ffmpeg_present = returncode == 0 and "FFmpeg" in output.decode()
|
||||
|
||||
# use globals as in-memory cache
|
||||
@@ -877,7 +877,7 @@ async def get_silence(
|
||||
@@ -878,7 +878,7 @@ async def get_silence(
|
||||
return
|
||||
# use ffmpeg for all other encodings
|
||||
args = [
|
||||
@@ -38,7 +38,7 @@ index 42011923..1e5dc112 100644
|
||||
"-hide_banner",
|
||||
"-loglevel",
|
||||
"quiet",
|
||||
@@ -971,7 +971,7 @@ def get_ffmpeg_args(
|
||||
@@ -972,7 +972,7 @@ def get_ffmpeg_args(
|
||||
|
||||
# generic args
|
||||
generic_args = [
|
||||
@@ -48,10 +48,10 @@ index 42011923..1e5dc112 100644
|
||||
"-loglevel",
|
||||
loglevel,
|
||||
diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py
|
||||
index dc38e4c0..f4f3e2fe 100644
|
||||
index d17b55f6..b7b56c04 100644
|
||||
--- a/music_assistant/server/helpers/tags.py
|
||||
+++ b/music_assistant/server/helpers/tags.py
|
||||
@@ -368,7 +368,7 @@ async def parse_tags(
|
||||
@@ -380,7 +380,7 @@ async def parse_tags(
|
||||
file_path = input_file if isinstance(input_file, str) else "-"
|
||||
|
||||
args = (
|
||||
@@ -60,7 +60,7 @@ index dc38e4c0..f4f3e2fe 100644
|
||||
"-hide_banner",
|
||||
"-loglevel",
|
||||
"fatal",
|
||||
@@ -440,7 +440,7 @@ async def get_embedded_image(input_file: str | AsyncGenerator[bytes, None]) -> b
|
||||
@@ -471,7 +471,7 @@ async def get_embedded_image(input_file: str | AsyncGenerator[bytes, None]) -> b
|
||||
"""
|
||||
file_path = input_file if isinstance(input_file, str) else "-"
|
||||
args = (
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "music-assistant-frontend";
|
||||
version = "2.5.15";
|
||||
version = "2.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-D8VFdXgaVXSxk7c24kvb9TflFztS1zLwW4qGqV32nLo=";
|
||||
hash = "sha256-KrloxxdqIwQ5NsxAGm28D5StHnw9LTqDDtcchD5X5Qk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,6 +11,19 @@ let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
aiojellyfin = super.aiojellyfin.overridePythonAttrs rec {
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jc2k";
|
||||
repo = "aiojellyfin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q+b1tKr46qq3PULPkCaQk2VoC1aaNxPK/E1Kj4PABfI=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
music-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
};
|
||||
};
|
||||
@@ -24,14 +37,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "music-assistant";
|
||||
version = "2.0.7";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "music-assistant";
|
||||
repo = "server";
|
||||
rev = version;
|
||||
hash = "sha256-JtdlZ3hH4fRU5TjmMUlrdSSCnLrIGCuSwSSrnLgjYEs=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ALsl2xfAFYejDEhR5/ZpeIxoHFgvz471tb4OP5xQAUE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -43,8 +56,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/--cov/d" pyproject.toml
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "0.0.0" "${version}"
|
||||
'';
|
||||
@@ -71,6 +82,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
certifi
|
||||
colorlog
|
||||
cryptography
|
||||
eyed3
|
||||
faust-cchardet
|
||||
ifaddr
|
||||
mashumaro
|
||||
@@ -87,10 +99,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
ffmpeg-headless
|
||||
aiojellyfin
|
||||
pytest-aiohttp
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
syrupy
|
||||
]
|
||||
++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "music_assistant" ];
|
||||
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
# Do not edit manually, run ./update-providers.py
|
||||
|
||||
{
|
||||
version = "2.0.7";
|
||||
version = "2.1.1";
|
||||
providers = {
|
||||
airplay = [
|
||||
];
|
||||
apple_music = [
|
||||
]; # missing pywidevine
|
||||
builtin = [
|
||||
];
|
||||
chromecast = ps: with ps; [
|
||||
@@ -29,8 +31,9 @@
|
||||
]; # missing hass-client
|
||||
hass_players = [
|
||||
];
|
||||
jellyfin = [
|
||||
]; # missing jellyfin_apiclient_python
|
||||
jellyfin = ps: with ps; [
|
||||
aiojellyfin
|
||||
];
|
||||
musicbrainz = [
|
||||
];
|
||||
opensubsonic = ps: with ps; [
|
||||
@@ -48,6 +51,7 @@
|
||||
aioslimproto
|
||||
];
|
||||
snapcast = ps: with ps; [
|
||||
bidict
|
||||
snapcast
|
||||
];
|
||||
sonos = ps: with ps; [
|
||||
@@ -71,8 +75,8 @@
|
||||
ugp = [
|
||||
];
|
||||
ytmusic = ps: with ps; [
|
||||
pytube
|
||||
yt-dlp
|
||||
ytmusicapi
|
||||
];
|
||||
]; # missing yt-dlp-youtube-accesstoken
|
||||
};
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ async def get_provider_manifests(version: str = "master") -> List:
|
||||
manifests = []
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
with urlopen(
|
||||
f"https://github.com/music-assistant/music-assistant/archive/{version}.tar.gz"
|
||||
f"https://github.com/music-assistant/music-assistant/archive/refs/tags/{version}.tar.gz"
|
||||
) as response:
|
||||
tarfile.open(fileobj=BytesIO(response.read())).extractall(
|
||||
tmp, filter="data"
|
||||
|
||||
@@ -78,6 +78,12 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_task_with_env"
|
||||
"--skip=test_pixi_only_env_activation"
|
||||
"--skip=cli::shell_hook::tests::test_environment_json"
|
||||
] ++ lib.optionals stdenv.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"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -111,6 +111,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
"reportlab"
|
||||
"requests"
|
||||
"rules"
|
||||
"whitenoise"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2024-07-20";
|
||||
version = "0-unstable-2024-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "d9ca201519ddd361987860efccf95babbe24163c";
|
||||
hash = "sha256-cftNBgsoKnqlV8Lu41prvaNQ3AhTnHb3CvzGv+D1kU4=";
|
||||
rev = "7d9ae262c95539593e286823b009499acb3ca8e5";
|
||||
hash = "sha256-Lzl0mke2DZJbISBDlphkzSycCr2ihyN/+JZbcGmO22o=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vwsfriend";
|
||||
version = "0.24.4";
|
||||
version = "0.24.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tillsteinbach";
|
||||
repo = "VWsFriend";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tt71J+UAIgYY/ac3ZyNDVTrnRvaKU+5WXVe///Hyv2U=";
|
||||
hash = "sha256-bKL0ExHV/wz3qwB5pMgZDkASr93sCUb01uTipkE5iJU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/vwsfriend";
|
||||
|
||||
@@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dprefix-dev=${placeholder "dev"}"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# Docs are opt-out in native but opt-in in cross builds.
|
||||
"-Dwith-docs=true"
|
||||
"-Denable-gir=true"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@@ -52,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Image pixel format conversion library";
|
||||
mainProgram = "babl";
|
||||
homepage = "https://gegl.org/babl/";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${replaceStrings [ "." ] [ "_" ] finalAttrs.version}/NEWS";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -1,9 +1,17 @@
|
||||
{ callPackage, fetchFromGitLab, ... }:
|
||||
{
|
||||
callPackage,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
}:
|
||||
let
|
||||
mkVariant =
|
||||
version: hash:
|
||||
{
|
||||
version,
|
||||
hash,
|
||||
patches ? [ ],
|
||||
}:
|
||||
callPackage ./generic.nix {
|
||||
inherit version;
|
||||
inherit version patches;
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "emersion";
|
||||
@@ -14,6 +22,21 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
libliftoff_0_4 = mkVariant "0.4.1" "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
|
||||
libliftoff_0_5 = mkVariant "0.5.0" "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g=";
|
||||
libliftoff_0_4 = mkVariant {
|
||||
version = "0.4.1";
|
||||
hash = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
|
||||
patches = [
|
||||
# Pull gcc-14 fix:
|
||||
# https://gitlab.freedesktop.org/emersion/libliftoff/-/merge_requests/78
|
||||
(fetchpatch {
|
||||
name = "libliftoff-gcc-14-calloc.patch";
|
||||
url = "https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch";
|
||||
hash = "sha256-Y8x1RK3o/I9bs/ZOLeC4t9AIK78l0QnlBWHhiVC+sz8=";
|
||||
})
|
||||
];
|
||||
};
|
||||
libliftoff_0_5 = mkVariant {
|
||||
version = "0.5.0";
|
||||
hash = "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
, libdrm
|
||||
, version
|
||||
, src
|
||||
, patches
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libliftoff";
|
||||
inherit version src;
|
||||
inherit version src patches;
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
|
||||
@@ -1,4 +1,21 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, perl, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, perl
|
||||
, zlib
|
||||
, libxml2
|
||||
, eigen
|
||||
, python
|
||||
, cairo
|
||||
, pcre
|
||||
, pkg-config
|
||||
, swig
|
||||
, rapidjson
|
||||
, boost
|
||||
, maeparser
|
||||
, coordgenlibs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openbabel";
|
||||
@@ -15,22 +32,23 @@ stdenv.mkDerivation rec {
|
||||
sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12
|
||||
'';
|
||||
|
||||
buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson ];
|
||||
buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson boost maeparser coordgenlibs ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
pythonMajorMinor = "${python.sourceVersion.major}.${python.sourceVersion.minor}";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRUN_SWIG=ON"
|
||||
"-DPYTHON_BINDINGS=ON"
|
||||
];
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(
|
||||
"-DRUN_SWIG=ON"
|
||||
"-DPYTHON_BINDINGS=ON"
|
||||
"-DPYTHON_INSTDIR=$out/${python.sitePackages}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Setuptools only accepts PEP 440 version strings. The "unstable" identifier
|
||||
# can not be used. Instead we pretend to be the 3.2 beta release.
|
||||
postFixup = ''
|
||||
cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
|
||||
from distutils.core import setup
|
||||
cat << EOF > $out/${python.sitePackages}/setup.py
|
||||
from setuptools import setup
|
||||
|
||||
setup(
|
||||
name = 'pyopenbabel',
|
||||
|
||||
@@ -7,23 +7,26 @@
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiofile";
|
||||
version = "3.8.6";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mosquito";
|
||||
repo = pname;
|
||||
repo = "aiofile";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KBly/aeHHZh7mL8MJ9gmxbqS7PmR4sedtBY/2HCXt54=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ caio ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ caio ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiomisc
|
||||
@@ -44,8 +47,12 @@ buildPythonPackage rec {
|
||||
"test_async_open_unicode"
|
||||
"test_async_open"
|
||||
"test_binary_io_wrapper"
|
||||
"test_line_reader_one_line"
|
||||
"test_modes"
|
||||
"test_open_non_existent_file_with_append"
|
||||
"test_text_io_wrapper"
|
||||
"test_truncate"
|
||||
"test_unicode_reader"
|
||||
"test_unicode_writer"
|
||||
"test_write_read_nothing"
|
||||
];
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
mashumaro,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pytest-aiohttp,
|
||||
pytest-cov-stub,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiojellyfin";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jc2k";
|
||||
repo = "aiojellyfin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D4/DlhCeeI4CggW7KGauZ57fHY92JM/kZSUODyNVcNg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
mashumaro
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-aiohttp
|
||||
pytest-cov-stub
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiojellyfin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "";
|
||||
homepage = "https://github.com/Jc2k/aiojellyfin";
|
||||
changelog = "https://github.com/Jc2k/aiojellyfin/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "17.5.24";
|
||||
version = "17.5.25";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9/7QI9z5dYADNRIWBelrUoNe/LaHqpb/Ch4e1Z9I1s4=";
|
||||
hash = "sha256-qxvisqvsDdhdFut9kvbmcjXAcTw7QpYruGk8zyQcg9M=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
+18
-14
@@ -1,40 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
msrest,
|
||||
msrestazure,
|
||||
azure-common,
|
||||
azure-mgmt-core,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isodate,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-servicefabricmanagedclusters";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg=";
|
||||
hash = "sha256-Bw+pMc0H9Gk8t4vaaOgwSMZ/zqzUJHGZ7keH+ylZnVw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
isodate
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
];
|
||||
|
||||
pythonNamespaces = [ "azure.mgmt" ];
|
||||
|
||||
# has no tests
|
||||
# Module has tests in mono-repo
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicefabricmanagedclusters/azure-mgmt-servicefabricmanagedclusters";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-servicefabricmanagedclusters_${version}/sdk/servicefabricmanagedclusters/azure-mgmt-servicefabricmanagedclusters/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,59 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
callPackage,
|
||||
fetchPypi,
|
||||
axisregistry,
|
||||
babelfont,
|
||||
beautifulsoup4,
|
||||
beziers,
|
||||
buildPythonPackage,
|
||||
callPackage,
|
||||
cmarkgfm,
|
||||
collidoscope,
|
||||
defcon,
|
||||
dehinter,
|
||||
fonttools,
|
||||
fetchPypi,
|
||||
font-v,
|
||||
fonttools,
|
||||
freetype-py,
|
||||
gflanguages,
|
||||
gfsubsets,
|
||||
git,
|
||||
glyphsets,
|
||||
lxml,
|
||||
installShellFiles,
|
||||
jinja2,
|
||||
lxml,
|
||||
munkres,
|
||||
opentypespec,
|
||||
ots-python,
|
||||
packaging,
|
||||
pip-api,
|
||||
protobuf,
|
||||
pytestCheckHook,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
requests,
|
||||
requests-mock,
|
||||
requests,
|
||||
rich,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
shaperglot,
|
||||
stringbrewer,
|
||||
toml,
|
||||
unicodedata2,
|
||||
ufo2ft,
|
||||
ufolint,
|
||||
unicodedata2,
|
||||
vharfbuzz,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontbakery";
|
||||
version = "0.12.7";
|
||||
version = "0.12.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7cZeazEyAyU+WDop2n7wneg2wzh+9U9atKSRcreJpGw=";
|
||||
hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
pythonRelaxDeps = [
|
||||
"collidoscope"
|
||||
"protobuf"
|
||||
"vharfbuzz"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
axisregistry
|
||||
@@ -64,17 +81,17 @@ buildPythonPackage rec {
|
||||
collidoscope
|
||||
defcon
|
||||
dehinter
|
||||
fonttools
|
||||
font-v
|
||||
fonttools
|
||||
freetype-py
|
||||
gflanguages
|
||||
gfsubsets
|
||||
glyphsets
|
||||
lxml
|
||||
jinja2
|
||||
lxml
|
||||
munkres
|
||||
ots-python
|
||||
opentypespec
|
||||
ots-python
|
||||
packaging
|
||||
pip-api
|
||||
protobuf
|
||||
@@ -84,26 +101,12 @@ buildPythonPackage rec {
|
||||
shaperglot
|
||||
stringbrewer
|
||||
toml
|
||||
ufo2ft
|
||||
ufolint
|
||||
unicodedata2
|
||||
vharfbuzz
|
||||
ufo2ft
|
||||
];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"collidoscope"
|
||||
"protobuf"
|
||||
"vharfbuzz"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
pytestCheckHook
|
||||
@@ -111,6 +114,7 @@ buildPythonPackage rec {
|
||||
requests-mock
|
||||
ufolint
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Let the tests invoke 'fontbakery' command.
|
||||
export PATH="$out/bin:$PATH"
|
||||
@@ -121,6 +125,7 @@ buildPythonPackage rec {
|
||||
git config user.name Test
|
||||
git commit --allow-empty --message 'Dummy commit for tests'
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# These require network access:
|
||||
"test_check_description_broken_links"
|
||||
@@ -145,6 +150,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Tool for checking the quality of font projects";
|
||||
homepage = "https://github.com/googlefonts/fontbakery";
|
||||
changelog = "https://github.com/fonttools/fontbakery/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danc86 ];
|
||||
};
|
||||
|
||||
@@ -39,14 +39,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphrag";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "graphrag";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hIAQOIqm9S9AtssE6UxcXfaIbSt3+506ueMrlathNaQ=";
|
||||
hash = "sha256-VOcUjfRik4sdk6xbrAe5I7788d2/l4tuUByJajSjo4Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -57,7 +57,9 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"aiofiles"
|
||||
"azure-identity"
|
||||
"lancedb"
|
||||
"scipy"
|
||||
"tenacity"
|
||||
"tiktoken"
|
||||
];
|
||||
|
||||
@@ -116,6 +118,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Modular graph-based Retrieval-Augmented Generation (RAG) system";
|
||||
homepage = "https://github.com/microsoft/graphrag";
|
||||
changelog = "https://github.com/microsoft/graphrag/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
boost,
|
||||
eigen,
|
||||
gmp,
|
||||
cgal, # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal
|
||||
cgal,
|
||||
mpfr,
|
||||
tbb,
|
||||
numpy,
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gudhi";
|
||||
version = "3.9.0";
|
||||
version = "3.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
repo = "gudhi-devel";
|
||||
rev = "tags/gudhi-release-${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-VL6RIPe8a2/cUHnHOql9e9EUMBB9QU311kMCaMZTbGI=";
|
||||
hash = "sha256-zHjSGm3hk3FZQmyQ03y14vJp5xeoofvij1hczKidvVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+1950
-1025
File diff suppressed because it is too large
Load Diff
@@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lancedb";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lancedb";
|
||||
rev = "refs/tags/python-v${version}";
|
||||
hash = "sha256-RWmvqGm/Bekajb/fs/PQJ2fL0Vo1Mmy+x40PKaDmIEU=";
|
||||
hash = "sha256-JT6HNuMjFO/q+6LlYRT+vKa0aV9DOC9b21ulHXq1gjY=";
|
||||
};
|
||||
|
||||
# ratelimiter only support up to python310 and it has been removed from nixpkgs
|
||||
@@ -113,6 +113,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Developer-friendly, serverless vector database for AI applications";
|
||||
homepage = "https://github.com/lancedb/lancedb";
|
||||
changelog = "https://github.com/lancedb/lancedb/releases/tag/python-v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-serialization-json";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-serialization-json-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/Bar1tQ3w8kfC53OuKxTlS+Dq4sX47lev7fjJeo6JJ0=";
|
||||
hash = "sha256-hGD8MhdQgF+mkoG4eOCSPyaArV8OrqAtgOwiNR8kado=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
azure-identity,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
microsoft-kiota-abstractions,
|
||||
microsoft-kiota-authentication-azure,
|
||||
microsoft-kiota-http,
|
||||
@@ -12,12 +13,11 @@
|
||||
microsoft-kiota-serialization-text,
|
||||
msgraph-core,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgraph-sdk";
|
||||
version = "1.4.0";
|
||||
version = "1.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,10 +26,10 @@ buildPythonPackage rec {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-afnxk79duKzTykNnSHPE6lZhMkOt+9JhEskj/KjQpQI=";
|
||||
hash = "sha256-Ty9e+xJ3+h4d0hmwtiZA9k5WMeuvT4iwNpR06KRpnfI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
dependencies = [
|
||||
azure-identity
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "16.4.2";
|
||||
version = "16.4.3";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-zU3Yzdu5iF6USGj7bpf52+UMyeJuC7LFvR9NOrd8gXE=";
|
||||
hash = "sha256-SHinfAWUqrPnHdDDXa1meVfxsyct17b1ak5U91GEc1w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
|
||||
index 94eec244..4bb15db9 100644
|
||||
index eaa48117..30201d97 100644
|
||||
--- a/src/ocrmypdf/_exec/ghostscript.py
|
||||
+++ b/src/ocrmypdf/_exec/ghostscript.py
|
||||
@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
|
||||
@@ -12,19 +12,19 @@ index 94eec244..4bb15db9 100644
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
|
||||
index 5a34a95a..5ee1b333 100644
|
||||
index 1c6dd5fe..b689a091 100644
|
||||
--- a/src/ocrmypdf/_exec/jbig2enc.py
|
||||
+++ b/src/ocrmypdf/_exec/jbig2enc.py
|
||||
@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run
|
||||
|
||||
@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run
|
||||
|
||||
def version() -> Version:
|
||||
- return Version(get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*'))
|
||||
+ return Version(get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*'))
|
||||
|
||||
|
||||
def available():
|
||||
@@ -27,7 +27,7 @@ def available():
|
||||
try:
|
||||
- version = get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*')
|
||||
+ version = get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*')
|
||||
except CalledProcessError as e:
|
||||
# TeX Live for Windows provides an incompatible jbig2.EXE which may
|
||||
# be on the PATH.
|
||||
@@ -33,7 +33,7 @@ def available():
|
||||
|
||||
def convert_group(cwd, infiles, out_prefix, threshold):
|
||||
args = [
|
||||
@@ -33,7 +33,7 @@ index 5a34a95a..5ee1b333 100644
|
||||
'-b',
|
||||
out_prefix,
|
||||
'--symbol-mode', # symbol mode (lossy)
|
||||
@@ -44,7 +44,7 @@ def convert_group(cwd, infiles, out_prefix, threshold):
|
||||
@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold):
|
||||
|
||||
|
||||
def convert_single(cwd, infile, outfile, threshold):
|
||||
@@ -65,7 +65,7 @@ index 5b8600d0..fcad771b 100644
|
||||
'--skip-if-larger',
|
||||
'--quality',
|
||||
diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py
|
||||
index fab92bb1..78b634a7 100644
|
||||
index 102bdab8..bfef4400 100644
|
||||
--- a/src/ocrmypdf/_exec/tesseract.py
|
||||
+++ b/src/ocrmypdf/_exec/tesseract.py
|
||||
@@ -95,7 +95,7 @@ class TesseractVersion(Version):
|
||||
@@ -96,10 +96,10 @@ index fab92bb1..78b634a7 100644
|
||||
args.extend(['-l', '+'.join(langs)])
|
||||
if engine_mode is not None:
|
||||
diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py
|
||||
index 493d9b3a..578c2dda 100644
|
||||
index d1165c46..7c732b15 100644
|
||||
--- a/src/ocrmypdf/_exec/unpaper.py
|
||||
+++ b/src/ocrmypdf/_exec/unpaper.py
|
||||
@@ -70,7 +70,7 @@ class UnpaperImageTooLargeError(Exception):
|
||||
@@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception):
|
||||
|
||||
|
||||
def version() -> Version:
|
||||
@@ -108,7 +108,7 @@ index 493d9b3a..578c2dda 100644
|
||||
|
||||
|
||||
@contextmanager
|
||||
@@ -92,7 +92,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]:
|
||||
@@ -70,7 +70,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]:
|
||||
def run_unpaper(
|
||||
input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str]
|
||||
) -> None:
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
buildPythonPackage rec {
|
||||
inherit (openbabel) pname version;
|
||||
|
||||
src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages";
|
||||
src = "${openbabel}/${python.sitePackages}";
|
||||
|
||||
nativeBuildInputs = [ openbabel ];
|
||||
buildInputs = [ openbabel ];
|
||||
|
||||
# these env variables are used by the bindings to find libraries
|
||||
# they need to be included explicitly in your nix-shell for
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "prisma";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "RobertCraigie";
|
||||
repo = "prisma-client-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7pibexiFsyrwC6rVv0CGHRbQU4G3rOXVhQW/7c/vKJA=";
|
||||
hash = "sha256-PeKRH+6/D5/VxnhRFhpvtZ85OL8mJDhG7QLn4oRUvfE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
+1402
-636
File diff suppressed because it is too large
Load Diff
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylance";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gwSpdj3i68QBrIcuvjj/32CsRKYVh9dSf98qNLDpxpc=";
|
||||
hash = "sha256-zJ6zyS9DNhlJ1wbXHZRtNMDytF/Beh9DDHKB8S9HFwk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "restrictedpython";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,10 +19,10 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "RestrictedPython";
|
||||
inherit version;
|
||||
hash = "sha256-h1rrUcE51440zvhgXcZTCbRJFoBg3QhVGh/p7bR8uaU=";
|
||||
hash = "sha256-TR0w9wmmYhynxCNvCLZ7cyplHICZFF8TcHjH3UvtPSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
aiohttp,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "solarlog-cli";
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dontinelli";
|
||||
repo = "solarlog_cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Bliq1n6xH0cZQHueiGDyalIo0zms8zCSpUGq2KH5xZY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
pythonImportsCheck = [ "solarlog_cli" ];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/dontinelli/solarlog_cli/releases/tag/v${version}";
|
||||
description = "Python library to access the Solar-Log JSON interface";
|
||||
homepage = "https://github.com/dontinelli/solarlog_cli";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -1,28 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
lightning-utilities,
|
||||
cloudpickle,
|
||||
scikit-learn,
|
||||
scikit-image,
|
||||
packaging,
|
||||
pretty-errors,
|
||||
psutil,
|
||||
py-deprecate,
|
||||
|
||||
# buildInputs
|
||||
torch,
|
||||
|
||||
# checks
|
||||
cloudpickle,
|
||||
psutil,
|
||||
pytestCheckHook,
|
||||
torchmetrics,
|
||||
pytorch-lightning,
|
||||
pytest-doctestplus,
|
||||
pytest-xdist,
|
||||
pytorch-lightning,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
|
||||
# passthru
|
||||
torchmetrics,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "torchmetrics";
|
||||
version = "1.4.0.post0";
|
||||
version = "1.4.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@@ -34,7 +41,7 @@ buildPythonPackage {
|
||||
owner = "Lightning-AI";
|
||||
repo = "torchmetrics";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tQqlLfdk8rSJqwR3rC7kqnM+pLFYZSPHfI7RmIi2Iq4=";
|
||||
hash = "sha256-NOxj1vVY9ynCS/Pf6V+ONNx50jjKqfkhzYbc60Sf4Qw=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
@@ -42,21 +49,20 @@ buildPythonPackage {
|
||||
lightning-utilities
|
||||
packaging
|
||||
pretty-errors
|
||||
py-deprecate
|
||||
];
|
||||
|
||||
# Let the user bring their own instance
|
||||
buildInputs = [ torch ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytorch-lightning
|
||||
scikit-learn
|
||||
scikit-image
|
||||
cloudpickle
|
||||
psutil
|
||||
pytestCheckHook
|
||||
pytest-doctestplus
|
||||
pytest-xdist
|
||||
pytorch-lightning
|
||||
scikit-image
|
||||
scikit-learn
|
||||
];
|
||||
|
||||
# A cyclic dependency in: integrations/test_lightning.py
|
||||
@@ -86,11 +92,11 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "torchmetrics" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)";
|
||||
homepage = "https://lightning.ai/docs/torchmetrics/";
|
||||
changelog = "https://github.com/Lightning-AI/torchmetrics/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SomeoneSerge ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ SomeoneSerge ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whitenoise";
|
||||
version = "6.6.0";
|
||||
version = "6.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "evansd";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Z59GjrOL+BPHqBCirg9T4qBOrjiuBng6Q5lTuLQx9ac=";
|
||||
hash = "sha256-4SrTiTqBrfFuQ/8mqQL+YiehFWW+ZzKiAF0h2XyYuSs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -41,7 +41,7 @@ in rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/rust-lang/rust-bindgen";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ johntitor ralith ];
|
||||
maintainers = with maintainers; [ johntitor ];
|
||||
mainProgram = "bindgen";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@@ -4193,7 +4193,8 @@
|
||||
"solaredge_local" = ps: with ps; [
|
||||
]; # missing inputs: solaredge-local
|
||||
"solarlog" = ps: with ps; [
|
||||
]; # missing inputs: solarlog_cli
|
||||
solarlog-cli
|
||||
];
|
||||
"solax" = ps: with ps; [
|
||||
solax
|
||||
];
|
||||
@@ -5892,6 +5893,7 @@
|
||||
"snmp"
|
||||
"snooz"
|
||||
"solaredge"
|
||||
"solarlog"
|
||||
"solax"
|
||||
"soma"
|
||||
"somfy_mylink"
|
||||
|
||||
@@ -5,18 +5,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "android-tv-card";
|
||||
version = "3.9.2";
|
||||
version = "3.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "android-tv-card";
|
||||
rev = version;
|
||||
hash = "sha256-kqMHwUyQGfD8dL6VZPFCrQ91/h7j5KJVnAL0hHNk/qg=";
|
||||
hash = "sha256-le9FdGuYQBi9wlnzSmoumIdYJKh06pFanmJo3V1hkJI=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-call-git.patch ];
|
||||
|
||||
npmDepsHash = "sha256-zoEZibm0i3AgM3mGgwIIkqtsNkMXWErUfQ9Kaprs+Ag=";
|
||||
npmDepsHash = "sha256-dUJCmiAESlcK09CQweujtH6fN2HxvGUPmQaG7IQMm5U=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
pname = "jicofo";
|
||||
version = "1.0-1084";
|
||||
version = "1.0-1090";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "yuTiuLAKGfmAtwCi6Dn+Z+lStsVX6PWsFeXV8qiTtJU=";
|
||||
sha256 = "CFt/08RoJEOQcB9v9jV9zh54oYroSqd+RsE8YcMmGg8=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
unwrapped = matrix-synapse-unwrapped;
|
||||
|
||||
# for backward compatibility
|
||||
inherit (matrix-synapse-unwrapped) plugins tools;
|
||||
inherit (matrix-synapse-unwrapped) plugins tests tools;
|
||||
};
|
||||
|
||||
# Carry the maintainer, licenses, and various useful information.
|
||||
|
||||
@@ -19,7 +19,6 @@ let packages = self:
|
||||
appName = pname;
|
||||
appVersion = data.version;
|
||||
license = appBaseDefs.${pname};
|
||||
unpack = false;
|
||||
inherit (data) url hash description homepage;
|
||||
}) {};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, readline, bison }:
|
||||
{ lib, stdenv, fetchpatch, fetchurl, readline, bison }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -17,6 +17,15 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot=.
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/wryun/es-shell/pull/101
|
||||
name = "new-compiler-issues.patch";
|
||||
url = "https://github.com/wryun/es-shell/commit/1eafb5fc4be735e59c9a091cc30adbca8f86fd96.patch";
|
||||
hash = "sha256-0CV1seEiH6PsUnq0akPLiRMy+kIb9qnAK7Ta4I47i60=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ bison ];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yash";
|
||||
version = "2.56.1";
|
||||
version = "2.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicant";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-G4l0JmtrYaVKfQiJKTOiNWgpsKNhHtbAT0l/VboMJTc=";
|
||||
hash = "sha256-TqQWbwNk2P2vETJ2294bd689WBry0xRdz7xz/NnMBrk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
};
|
||||
in buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "18.2.33";
|
||||
version = "18.2.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DcdCIsvdqIJdBhL+K2mN2q6cWIgoKQKwFDK60pb4ckE=";
|
||||
hash = "sha256-0ypcpbM0rNHbGW8GQb0HZwpc6xi6huzG1s11LkYTQR8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Z/xbKGmUi68Sdtvh2JowGqkLXIulvZhX8wW7w2+tBbg=";
|
||||
npmDepsHash = "sha256-dzbtUAwGw+DCtZTScQr8NyPOlyFcIMSFtK8/Sww4TBo=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "panoply";
|
||||
version = "5.4.3";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
|
||||
sha256 = "sha256-xey1Og0TEMgCc9Me/np7BGnUNYTz98gMFzLm2IcQHtw=";
|
||||
sha256 = "sha256-dBWWKSNlmTWX7egOoWpp+kn5KYIMrIfHBA6SMIhWj+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -289,6 +289,8 @@ self: super: with self; {
|
||||
|
||||
aioinflux = callPackage ../development/python-modules/aioinflux { };
|
||||
|
||||
aiojellyfin = callPackage ../development/python-modules/aiojellyfin { };
|
||||
|
||||
aiojobs = callPackage ../development/python-modules/aiojobs { };
|
||||
|
||||
aiokafka = callPackage ../development/python-modules/aiokafka { };
|
||||
@@ -14546,6 +14548,8 @@ self: super: with self; {
|
||||
|
||||
softlayer = callPackage ../development/python-modules/softlayer { };
|
||||
|
||||
solarlog-cli = callPackage ../development/python-modules/solarlog-cli { };
|
||||
|
||||
solax = callPackage ../development/python-modules/solax { };
|
||||
|
||||
solc-select = callPackage ../development/python-modules/solc-select { };
|
||||
|
||||
Reference in New Issue
Block a user