github-actions[bot]
2 years ago
committed by
GitHub
commit
c635c6621e
@ -0,0 +1,28 @@ |
||||
{ pkgs, lib, config, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
cfg = config.hardware.new-lg4ff; |
||||
in { |
||||
options.hardware.new-lg4ff = { |
||||
enable = mkOption { |
||||
type = types.bool; |
||||
default = false; |
||||
description = '' |
||||
Enables improved Linux module drivers for Logitech driving wheels. |
||||
This will replace the existing in-kernel hid-logitech modules. |
||||
Works most notably on the Logitech G25, G27, G29 and Driving Force (GT). |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
config = { |
||||
boot = { |
||||
extraModulePackages = [ pkgs.new-lg4ff ]; |
||||
kernelModules = [ "hid-logitech-new" ]; |
||||
}; |
||||
}; |
||||
|
||||
meta.maintainers = with lib.maintainers; [ matthiasbenaets ]; |
||||
} |
||||
@ -1,13 +0,0 @@ |
||||
diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py
|
||||
index 1f424146..57620334 100644
|
||||
--- a/kitty_tests/ssh.py
|
||||
+++ b/kitty_tests/ssh.py
|
||||
@@ -197,7 +197,7 @@ def test_ssh_login_shell_detection(self):
|
||||
expected_login_shell = pwd.getpwuid(os.geteuid()).pw_shell
|
||||
for m in methods:
|
||||
for sh in self.all_possible_sh:
|
||||
- if 'python' in sh:
|
||||
+ if 'python' in sh or '/sbin/nologin' in expected_login_shell:
|
||||
continue
|
||||
with self.subTest(sh=sh, method=m), tempfile.TemporaryDirectory() as tdir:
|
||||
pty = self.check_bootstrap(sh, tdir, test_script=f'{m}; echo "$login_shell"; exit 0', SHELL_INTEGRATION_VALUE='')
|
||||
@ -1,27 +0,0 @@ |
||||
From 59f6876187da2c01b35e696e169ca98239c08a41 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Felice <jason.m.felice@gmail.com>
|
||||
Date: Tue, 24 May 2022 07:54:25 -0400
|
||||
Subject: [PATCH] Restore write permissions in tarball
|
||||
|
||||
In Nix, the source files are stored in an immutable store and
|
||||
therefore have been stripped of write permissions. When the SSH
|
||||
kitten makes the tarfile, the files contained in it are also missing
|
||||
the write permissions, causing commands on the remote side to fail.
|
||||
---
|
||||
kittens/ssh/main.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py
|
||||
index 0b50d5ff..f80ac13d 100644
|
||||
--- a/kittens/ssh/main.py
|
||||
+++ b/kittens/ssh/main.py
|
||||
@@ -123,6 +123,7 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str], compression: st
|
||||
def normalize_tarinfo(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo:
|
||||
tarinfo.uname = tarinfo.gname = ''
|
||||
tarinfo.uid = tarinfo.gid = 0
|
||||
+ tarinfo.mode |= 0o200
|
||||
return tarinfo
|
||||
|
||||
def add_data_as_file(tf: tarfile.TarFile, arcname: str, data: Union[str, bytes]) -> tarfile.TarInfo:
|
||||
--
|
||||
2.36.0
|
||||
@ -1,64 +1,134 @@ |
||||
{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch |
||||
, cairo, ffmpeg, sox, xdg-utils, texlive |
||||
, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub |
||||
, pbr, fetchPypi |
||||
{ lib |
||||
, fetchFromGitHub |
||||
|
||||
, cairo |
||||
, ffmpeg |
||||
, texlive |
||||
|
||||
, python3 |
||||
}: |
||||
buildPythonApplication rec { |
||||
|
||||
let |
||||
# According to ManimCommunity documentation manim uses tex-packages packaged |
||||
# in a custom distribution called "manim-latex", |
||||
# |
||||
# https://community.chocolatey.org/packages/manim-latex#files |
||||
# |
||||
# which includes another cutom distribution called tinytex, for which the |
||||
# package list can be found at |
||||
# |
||||
# https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt |
||||
# |
||||
# these two combined add up to: |
||||
manim-tinytex = { |
||||
inherit (texlive) |
||||
|
||||
# tinytex |
||||
scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex |
||||
bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex |
||||
etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec |
||||
framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def |
||||
grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr |
||||
intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel |
||||
l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev |
||||
latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex |
||||
lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib |
||||
pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc |
||||
tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter |
||||
url xcolor xetex xetexconfig xkeyval xunicode zapfding |
||||
|
||||
# manim-latex |
||||
standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e |
||||
fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super |
||||
babel-english gnu-freefont mathastext cbfonts-fd; |
||||
}; |
||||
in python3.pkgs.buildPythonApplication rec { |
||||
pname = "manim"; |
||||
version = "0.1.10"; |
||||
format = "pyproject"; |
||||
version = "0.15.2"; |
||||
disabled = python3.pythonOlder "3.8"; |
||||
|
||||
src = fetchPypi { |
||||
pname = "manimlib"; |
||||
inherit version; |
||||
sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; |
||||
src = fetchFromGitHub { |
||||
owner = "ManimCommunity"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA="; |
||||
}; |
||||
|
||||
patches = [ ./remove-dependency-constraints.patch ]; |
||||
nativeBuildInputs = [ |
||||
python3.pkgs.poetry-core |
||||
]; |
||||
|
||||
nativeBuildInputs = [ pbr ]; |
||||
postPatch = '' |
||||
substituteInPlace pyproject.toml \ |
||||
--replace 'cloup = "^0.13.0"' 'cloup = "*"' \ |
||||
--replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ |
||||
''; |
||||
|
||||
propagatedBuildInputs = [ |
||||
buildInputs = [ cairo ]; |
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [ |
||||
click |
||||
click-default-group |
||||
cloup |
||||
colour |
||||
grpcio |
||||
grpcio-tools |
||||
importlib-metadata |
||||
isosurfaces |
||||
jupyterlab |
||||
manimpango |
||||
mapbox-earcut |
||||
moderngl |
||||
moderngl-window |
||||
networkx |
||||
numpy |
||||
pillow |
||||
progressbar |
||||
scipy |
||||
tqdm |
||||
opencv |
||||
pycairo |
||||
pydub |
||||
pygments |
||||
pysrt |
||||
rich |
||||
scipy |
||||
screeninfo |
||||
skia-pathops |
||||
srt |
||||
tqdm |
||||
watchdog |
||||
]; |
||||
|
||||
cairo sox ffmpeg xdg-utils |
||||
makeWrapperArgs = [ |
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ |
||||
ffmpeg |
||||
(texlive.combine manim-tinytex) |
||||
]) |
||||
]; |
||||
|
||||
# Test with texlive to see whether it works but don't propagate |
||||
# because it's huge and optional |
||||
# TODO: Use smaller TexLive distribution |
||||
# Doesn't need everything but it's hard to figure out what it needs |
||||
checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ]; |
||||
|
||||
# Simple test and complex test with LaTeX |
||||
checkPhase = '' |
||||
for scene in SquareToCircle OpeningManimExample |
||||
do |
||||
python3 manim.py example_scenes.py $scene -l |
||||
tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs |
||||
${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ |
||||
| tee | grep -F "ISO Media, MP4 Base Media v1 [ISO 14496-12:2003]" |
||||
done |
||||
''; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
checkInputs = [ |
||||
python3.pkgs.pytest-cov |
||||
python3.pkgs.pytest-xdist |
||||
python3.pkgs.pytestCheckHook |
||||
|
||||
ffmpeg |
||||
(texlive.combine manim-tinytex) |
||||
]; |
||||
|
||||
# about 55 of ~600 tests failing mostly due to demand for display |
||||
disabledTests = import ./failing_tests.nix; |
||||
|
||||
pythonImportsCheck = [ "manim" ]; |
||||
|
||||
meta = { |
||||
description = "Animation engine for explanatory math videos"; |
||||
meta = with lib; { |
||||
description = "Animation engine for explanatory math videos - Community version"; |
||||
longDescription = '' |
||||
Manim is an animation engine for explanatory math videos. It's used to |
||||
create precise animations programmatically, as seen in the videos of |
||||
3Blue1Brown on YouTube. |
||||
3Blue1Brown on YouTube. This is the community maintained version of |
||||
manim. |
||||
''; |
||||
homepage = "https://github.com/3b1b/manim"; |
||||
license = lib.licenses.mit; |
||||
maintainers = with lib.maintainers; [ johnazoidberg ]; |
||||
homepage = "https://github.com/ManimCommunity/manim"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ friedelino ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,74 @@ |
||||
# reason for failure: tests try to open display |
||||
[ |
||||
"test_background_color" |
||||
"test_scene_add_remove" |
||||
"test_Circle" |
||||
"test_wait_skip" |
||||
"test_basic_scene_with_default_values" |
||||
"test_dry_run_with_png_format" |
||||
"test_dry_run_with_png_format_skipped_animations" |
||||
"test_FixedMobjects3D" |
||||
"test_basic_scene_l_flag" |
||||
"test_n_flag" |
||||
"test_s_flag_opengl_renderer" |
||||
"test_s_flag_no_animations" |
||||
"test_image_output_for_static_scene" |
||||
"test_no_image_output_with_interactive_embed" |
||||
"test_no_default_image_output_with_non_static_scene" |
||||
"test_image_output_for_static_scene_with_write_to_movie" |
||||
"test_s_flag" |
||||
"test_r_flag" |
||||
"test_play_skip" |
||||
"test_write_to_movie_disables_window" |
||||
"test_a_flag" |
||||
"test_pixel_coords_to_space_coords" |
||||
"test_t_values" |
||||
"test_custom_folders" |
||||
"test_t_values[15]" |
||||
"test_t_values[30]" |
||||
"test_t_values[60]" |
||||
"test_dash_as_filename" |
||||
"test_images_are_created_when_png_format_set_for_opengl" |
||||
"test_t_values_with_skip_animations" |
||||
"test_static_wait_detection" |
||||
"test_non_static_wait_detection" |
||||
"test_frozen_frame" |
||||
"test_gif_format_output" |
||||
"test_animate_with_changed_custom_attribute" |
||||
"test_images_are_zero_padded_when_zero_pad_set_for_opengl" |
||||
"test_mp4_format_output" |
||||
"test_videos_not_created_when_png_format_set" |
||||
"test_images_are_created_when_png_format_set" |
||||
"test_images_are_zero_padded_when_zero_pad_set" |
||||
"test_webm_format_output" |
||||
"test_default_format_output_for_transparent_flag" |
||||
"test_mov_can_be_set_as_output_format" |
||||
"test_force_window_opengl_render_with_format" |
||||
"test_get_frame_with_preview_disabled" |
||||
"test_get_frame_with_preview_enabled" |
||||
] ++ |
||||
|
||||
# reason for failure: tests try to reach network |
||||
[ |
||||
"test_logging_to_file" |
||||
"test_plugin_function_like" |
||||
"test_plugin_no_all" |
||||
"test_plugin_with_all" |
||||
] ++ |
||||
|
||||
# failing with: |
||||
# E AssertionError: |
||||
# E Not equal to tolerance rtol=1e-07, atol=1.01 |
||||
# E Frame no -1. You can use --show_diff to visually show the difference. |
||||
# E Mismatched elements: 18525 / 1639680 (1.13%) |
||||
# E Max absolute difference: 255 |
||||
# E Max relative difference: 255. |
||||
[ |
||||
"test_Text2Color" |
||||
] ++ |
||||
|
||||
# failing with: |
||||
# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? |
||||
[ |
||||
"test_force_window_opengl_render_with_movies" |
||||
] |
||||
@ -1,26 +0,0 @@ |
||||
diff --git i/requirements.txt w/requirements.txt
|
||||
index 556122ad..11fd49d5 100644
|
||||
--- i/requirements.txt
|
||||
+++ w/requirements.txt
|
||||
@@ -1,11 +1,10 @@
|
||||
-argparse==1.4.0
|
||||
-colour==0.1.5
|
||||
-numpy==1.15.0
|
||||
-Pillow==5.2.0
|
||||
-progressbar==2.5
|
||||
-scipy==1.1.0
|
||||
-tqdm==4.24.0
|
||||
-opencv-python==3.4.2.17
|
||||
-pycairo==1.17.1; sys_platform == 'linux'
|
||||
-pycairo>=1.18.0; sys_platform == 'win32'
|
||||
-pydub==0.23.0
|
||||
+colour
|
||||
+numpy
|
||||
+Pillow
|
||||
+progressbar
|
||||
+scipy
|
||||
+tqdm
|
||||
+pycairo
|
||||
+pycairo>=1.18.1; sys_platform == 'win32'
|
||||
+pydub
|
||||
+pyreadline==2.1; sys_platform == 'win32'
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,44 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, pytestCheckHook |
||||
, click |
||||
, setuptools-scm |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "cloup"; |
||||
version = "0.14.0"; |
||||
|
||||
disabled = pythonOlder "3.6"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "4dec7e43905b7771884cda4f13ab8b7537bceaee467a92655e7660797ab08c47"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
setuptools-scm |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
click |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "cloup" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/janLuke/cloup"; |
||||
description = "Click extended with option groups, constraints, aliases, help themes"; |
||||
longDescription = '' |
||||
Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff. |
||||
''; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ friedelino ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, numpy |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "isosurfaces"; |
||||
version = "0.1.0"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "fa1b44e5e59d2f429add49289ab89e36f8dcda49b7badd99e0beea273be331f4"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ numpy ]; |
||||
|
||||
# no tests defined upstream |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ "isosurfaces" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/jared-hughes/isosurfaces"; |
||||
description = "Construct isolines/isosurfaces of a 2D/3D scalar field defined by a function"; |
||||
longDescription = '' |
||||
Construct isolines/isosurfaces of a 2D/3D scalar field defined by a |
||||
function, i.e. curves over which f(x,y)=0 or surfaces over which |
||||
f(x,y,z)=0. Most similar libraries use marching squares or similar over a |
||||
uniform grid, but this uses a quadtree to avoid wasting time sampling |
||||
many far from the implicit surface. |
||||
''; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ friedelino ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,41 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, fetchFromGitHub |
||||
, numpy |
||||
, pybind11 |
||||
, pytestCheckHook |
||||
, setuptools |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "mapbox-earcut"; |
||||
version = "1.0.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "skogler"; |
||||
repo = "mapbox_earcut_python"; |
||||
rev = "v${version}"; |
||||
sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ setuptools pybind11 ]; |
||||
|
||||
propagatedBuildInputs = [ numpy ]; |
||||
|
||||
checkInputs = [ pytestCheckHook ]; |
||||
|
||||
pythonImportsCheck = [ "mapbox_earcut" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/skogler/mapbox_earcut_python"; |
||||
license = licenses.isc; |
||||
description = "Mapbox-earcut fast triangulation of 2D-polygons"; |
||||
longDescription = '' |
||||
Python bindings for the C++ implementation of the Mapbox Earcut |
||||
library, which provides very fast and quite robust triangulation of 2D |
||||
polygons. |
||||
''; |
||||
maintainers = with maintainers; [ friedelino ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, pythonOlder |
||||
, fetchFromGitHub |
||||
, flit-core |
||||
, requests |
||||
, pytestCheckHook |
||||
, responses |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "msgraph-core"; |
||||
version = "0.2.2"; |
||||
|
||||
disabled = pythonOlder "3.5"; |
||||
|
||||
format = "pyproject"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "microsoftgraph"; |
||||
repo = "msgraph-sdk-python-core"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
flit-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
requests |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
responses |
||||
]; |
||||
|
||||
disabledTestPaths = [ |
||||
"tests/integration" |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "msgraph.core" ]; |
||||
|
||||
meta = { |
||||
description = "Core component of the Microsoft Graph Python SDK"; |
||||
homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; |
||||
license = lib.licenses.mit; |
||||
maintainers = with lib.maintainers; [ dotlambda ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,33 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, hypothesis |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "srt"; |
||||
version = "3.5.2"; |
||||
|
||||
disabled = pythonOlder "2.7"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450"; |
||||
}; |
||||
|
||||
checkInputs = [ |
||||
hypothesis |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "srt" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/cdown/srt"; |
||||
description = "A tiny but featureful Python library for parsing, modifying, and composing SRT files"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ friedelino ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,31 @@ |
||||
{ lib |
||||
, fetchFromGitHub |
||||
, rustPlatform |
||||
}: |
||||
|
||||
rustPlatform.buildRustPackage rec { |
||||
pname = "beancount-language-server"; |
||||
version = "1.1.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "polarmutex"; |
||||
repo = "beancount-language-server"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4="; |
||||
}; |
||||
|
||||
cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic="; |
||||
|
||||
doInstallCheck = true; |
||||
postInstallCheck = '' |
||||
$out/bin/beancount-language-server --help > /dev/null |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A Language Server Protocol (LSP) for beancount files"; |
||||
homepage = "https://github.com/polarmutex/beancount-language-server"; |
||||
license = with licenses; [ mit ]; |
||||
maintainers = with maintainers; [ polarmutex ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,36 @@ |
||||
{ lib, stdenv, kernel, fetchFromGitHub }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "new-lg4ff"; |
||||
version = "0.3.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "berarma"; |
||||
repo = "new-lg4ff"; |
||||
rev = "${version}"; |
||||
sha256 = "+05xDpNI4m6wTS+YPgA0fP4iM10nMOZOtCrdQxpevBU="; |
||||
}; |
||||
|
||||
preBuild = '' |
||||
substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" |
||||
sed -i '/depmod/d' Makefile |
||||
sed -i "10i\\\trmmod hid-logitech 2> /dev/null || true" Makefile |
||||
sed -i "11i\\\trmmod hid-logitech-new 2> /dev/null || true" Makefile |
||||
''; |
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies; |
||||
|
||||
makeFlags = [ |
||||
"KVERSION=${kernel.modDirVersion}" |
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Experimental Logitech force feedback module for Linux"; |
||||
homepage = "https://github.com/berarma/new-lg4ff"; |
||||
license = licenses.gpl2Only; |
||||
maintainers = with maintainers; [ matthiasbenaets ]; |
||||
platforms = platforms.linux; |
||||
broken = stdenv.isAarch64; |
||||
}; |
||||
} |
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
|
||||
index 50e2c9f..46e7f61 100755
|
||||
--- a/src/you_get/processor/ffmpeg.py
|
||||
+++ b/src/you_get/processor/ffmpeg.py
|
||||
@@ -31,7 +31,7 @@ def get_usable_ffmpeg(cmd):
|
||||
except:
|
||||
return None
|
||||
|
||||
-FFMPEG, FFPROBE, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None, None)
|
||||
+FFMPEG, FFPROBE, FFMPEG_VERSION = ('@ffmpeg@', '@ffprobe@', '@version@')
|
||||
if logging.getLogger().isEnabledFor(logging.DEBUG):
|
||||
LOGLEVEL = ['-loglevel', 'info']
|
||||
STDIN = None
|
||||
Loading…
Reference in new issue