mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +03:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
3e46fb5876
18 changed files with 327 additions and 99 deletions
|
|
@ -12392,6 +12392,12 @@
|
|||
github = "kaeeraa";
|
||||
githubId = 99148867;
|
||||
};
|
||||
kagehisa = {
|
||||
name = "Sven Woelfel";
|
||||
email = "woelfel.pub@gmail.com";
|
||||
github = "kagehisa";
|
||||
githubId = 37015428;
|
||||
};
|
||||
kaiha = {
|
||||
email = "kai.harries@gmail.com";
|
||||
github = "KaiHa";
|
||||
|
|
|
|||
|
|
@ -111,6 +111,8 @@ in
|
|||
Enable this option if you want to ascertain that your documents are correct
|
||||
'';
|
||||
|
||||
package = lib.mkPackageOption pkgs "bootspec" { };
|
||||
|
||||
extensions = lib.mkOption {
|
||||
# NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.
|
||||
type = lib.types.attrsOf lib.types.anything; # <namespace>: { ...namespace-specific fields }
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ let
|
|||
|
||||
systemd = config.systemd.package;
|
||||
|
||||
bootspecTools = pkgs.bootspec;
|
||||
bootspecTools = config.boot.bootspec.package;
|
||||
|
||||
nix = config.nix.package.out;
|
||||
|
||||
|
|
|
|||
|
|
@ -680,95 +680,97 @@ let
|
|||
in
|
||||
{
|
||||
# The configuration of the system used to run "nixos-install".
|
||||
installer = {
|
||||
imports = [
|
||||
commonConfig
|
||||
../modules/profiles/installation-device.nix
|
||||
../modules/profiles/base.nix
|
||||
extraInstallerConfig
|
||||
./common/auto-format-root-device.nix
|
||||
];
|
||||
installer =
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
commonConfig
|
||||
../modules/profiles/installation-device.nix
|
||||
../modules/profiles/base.nix
|
||||
extraInstallerConfig
|
||||
./common/auto-format-root-device.nix
|
||||
];
|
||||
|
||||
# In systemdStage1, also automatically format the device backing the
|
||||
# root filesystem.
|
||||
virtualisation.fileSystems."/".autoFormat = systemdStage1;
|
||||
# In systemdStage1, also automatically format the device backing the
|
||||
# root filesystem.
|
||||
virtualisation.fileSystems."/".autoFormat = systemdStage1;
|
||||
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
# the same during and after installation.
|
||||
virtualisation.emptyDiskImages = [ 512 ];
|
||||
virtualisation.rootDevice = "/dev/vdb";
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
# the same during and after installation.
|
||||
virtualisation.emptyDiskImages = [ 512 ];
|
||||
virtualisation.rootDevice = "/dev/vdb";
|
||||
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
nix.package = selectNixPackage pkgs;
|
||||
nix.package = selectNixPackage pkgs;
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
|
||||
# The test cannot access the network, so any packages we
|
||||
# need must be included in the VM.
|
||||
system.extraDependencies =
|
||||
with pkgs;
|
||||
[
|
||||
bintools
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
desktop-file-utils
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
kbd.dev
|
||||
kmod.dev
|
||||
libarchive.dev
|
||||
libxml2.bin
|
||||
libxslt.bin
|
||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
ntp
|
||||
perlPackages.ConfigIniFiles
|
||||
perlPackages.FileSlurp
|
||||
perlPackages.JSON
|
||||
perlPackages.ListCompare
|
||||
perlPackages.XMLLibXML
|
||||
# make-options-doc/default.nix
|
||||
(python3.withPackages (p: [ p.mistune ]))
|
||||
shared-mime-info
|
||||
sudo
|
||||
switch-to-configuration-ng
|
||||
texinfo
|
||||
unionfs-fuse
|
||||
xorg.lndir
|
||||
shellcheck-minimal
|
||||
|
||||
# add curl so that rather than seeing the test attempt to download
|
||||
# curl's tarball, we see what it's trying to download
|
||||
curl
|
||||
]
|
||||
++ optionals (bootLoader == "grub") (
|
||||
let
|
||||
zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;
|
||||
in
|
||||
# The test cannot access the network, so any packages we
|
||||
# need must be included in the VM.
|
||||
system.extraDependencies =
|
||||
with pkgs;
|
||||
[
|
||||
(pkgs.grub2.override { inherit zfsSupport; })
|
||||
(pkgs.grub2_efi.override { inherit zfsSupport; })
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader
|
||||
pkgs.perlPackages.FileCopyRecursive
|
||||
pkgs.perlPackages.XMLSAX
|
||||
pkgs.perlPackages.XMLSAXBase
|
||||
]
|
||||
)
|
||||
++ optionals (bootLoader == "systemd-boot") [
|
||||
pkgs.zstd.bin
|
||||
pkgs.mypy
|
||||
pkgs.bootspec
|
||||
]
|
||||
++ optionals clevisTest [ pkgs.klibc ]
|
||||
++ optional systemdStage1 pkgs.chroot-realpath;
|
||||
bintools
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
desktop-file-utils
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
kbd.dev
|
||||
kmod.dev
|
||||
libarchive.dev
|
||||
libxml2.bin
|
||||
libxslt.bin
|
||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
ntp
|
||||
perlPackages.ConfigIniFiles
|
||||
perlPackages.FileSlurp
|
||||
perlPackages.JSON
|
||||
perlPackages.ListCompare
|
||||
perlPackages.XMLLibXML
|
||||
# make-options-doc/default.nix
|
||||
(python3.withPackages (p: [ p.mistune ]))
|
||||
shared-mime-info
|
||||
sudo
|
||||
switch-to-configuration-ng
|
||||
texinfo
|
||||
unionfs-fuse
|
||||
xorg.lndir
|
||||
shellcheck-minimal
|
||||
|
||||
nix.settings = {
|
||||
substituters = mkForce [ ];
|
||||
hashed-mirrors = null;
|
||||
connect-timeout = 1;
|
||||
# add curl so that rather than seeing the test attempt to download
|
||||
# curl's tarball, we see what it's trying to download
|
||||
curl
|
||||
]
|
||||
++ optionals (bootLoader == "grub") (
|
||||
let
|
||||
zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;
|
||||
in
|
||||
[
|
||||
(pkgs.grub2.override { inherit zfsSupport; })
|
||||
(pkgs.grub2_efi.override { inherit zfsSupport; })
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader
|
||||
pkgs.perlPackages.FileCopyRecursive
|
||||
pkgs.perlPackages.XMLSAX
|
||||
pkgs.perlPackages.XMLSAXBase
|
||||
]
|
||||
)
|
||||
++ optionals (bootLoader == "systemd-boot") [
|
||||
pkgs.zstd.bin
|
||||
pkgs.mypy
|
||||
config.boot.bootspec.package
|
||||
]
|
||||
++ optionals clevisTest [ pkgs.klibc ]
|
||||
++ optional systemdStage1 pkgs.chroot-realpath;
|
||||
|
||||
nix.settings = {
|
||||
substituters = mkForce [ ];
|
||||
hashed-mirrors = null;
|
||||
connect-timeout = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
target = {
|
||||
imports = [ commonConfig ];
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
libGL,
|
||||
libGLU,
|
||||
libpng,
|
||||
binutils,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
|
|
@ -32,10 +33,17 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
copyDesktopItems
|
||||
graphicsmagick
|
||||
SDL # for sdl-config during build time
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
binutils # build calls `ar`
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
39
pkgs/by-name/bo/bootspec-lix/package.nix
Normal file
39
pkgs/by-name/bo/bootspec-lix/package.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bootspec-lix";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.lix.systems";
|
||||
owner = "lix-community";
|
||||
repo = "bootspec";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/DeterminateSystems/bootspec/pull/127
|
||||
# Fixes the synthesize tool for aarch64-linux
|
||||
(fetchpatch {
|
||||
name = "aarch64-support.patch";
|
||||
url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch";
|
||||
sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0=";
|
||||
})
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vendor-neutral implementation of RFC-0125's datatype and synthesis tooling";
|
||||
homepage = "https://git.lix.systems/lix-community/bootspec";
|
||||
license = licenses.mit;
|
||||
maintainers = [ lib.maintainers.raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.408";
|
||||
version = "0.0.409";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cjxoh+fWI20KRTOgTCJ2KOtS3e7GuitreS85S2BbtNU=";
|
||||
hash = "sha256-1AS2N/IFPxrcDGQqbWFvznnVQ50Preqp/f/cOGJ15CM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OBFzi8n29gnyMvwLYsmJz8oLLvR2i6YRNrfWxkRwC/s=";
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.15.2";
|
||||
version = "2.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3IGXjMVMSbpcdwEvJcMbFuQI9GYy1TY9NWAvum14UK4=";
|
||||
hash = "sha256-zkOOUMyAvYYJnYn4s7D4tsYhodVX5kvPdXBBknBsusY=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "presenterm";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = "presenterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2k1YCzRoXt5Nmn+HH2qkdpP3S3+PJ5OVSVx29nYSdF8=";
|
||||
hash = "sha256-5eDGoY4Yb27ATgBhNjlee6tSgwAKiLuuDMrL96cBpko=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-M9VcwfG6NwUIvOkZKdoh97GVJEivkEmXhlApGQ1Hqds=";
|
||||
cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100=";
|
||||
|
||||
checkFlags = [
|
||||
# failed to load .tmpEeeeaQ: No such file or directory (os error 2)
|
||||
|
|
|
|||
47
pkgs/by-name/sa/sarif-converter/package.nix
Normal file
47
pkgs/by-name/sa/sarif-converter/package.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitLab,
|
||||
nix-update-script,
|
||||
sarif-converter,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sarif-converter";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ignis-build";
|
||||
repo = "sarif-converter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q8L4C4mTJEfxASqrUAZlMoLx71/+nmP6mwW/vNFStTs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vK+HhHlFWoWIrDEZzfRoqtJ3vKp0f4b8l8+LBlZuBJU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/main $out/bin/sarif-converter
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = sarif-converter;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Convert from [SARIF](https://sarifweb.azurewebsites.net/) to GitLab Code Quality and SAST report";
|
||||
homepage = "https://gitlab.com/ignis-build/sarif-converter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
mainProgram = "sarif-converter";
|
||||
};
|
||||
})
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpleDBus";
|
||||
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-suVaiFE60g2OlIF4DLGoHKr7ehUtThLcB/GoVCOfxJg=";
|
||||
hash = "sha256-VaaDk+pLRUlVjGKFzi22QhYxk1b2bo6rX9TVeJsJdh8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
54
pkgs/by-name/us/usbip-ssh/package.nix
Normal file
54
pkgs/by-name/us/usbip-ssh/package.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
perl,
|
||||
openssh,
|
||||
kmod,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "usbip-ssh";
|
||||
version = "0-unstable-2024-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turistu";
|
||||
repo = "usbip-ssh";
|
||||
rev = "1b38f2d7854048bf6129ffe992f3c9caa630e377";
|
||||
hash = "sha256-3kGGMlIMTXnBVLgsZijc0yLbyaZZSDf7lr46mg0viWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 usbip-ssh -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/usbip-ssh --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
perl
|
||||
openssh
|
||||
kmod
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/turistu/usbip-ssh";
|
||||
description = "Import usb devices from another linux machine with ssh's connection forwarding mechanism";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ kagehisa ];
|
||||
mainProgram = "usbip-ssh";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
granite,
|
||||
libgee,
|
||||
libhandy,
|
||||
gala,
|
||||
gnome-desktop,
|
||||
gnome-settings-daemon,
|
||||
mutter,
|
||||
|
|
@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
accountsservice
|
||||
elementary-icon-theme
|
||||
gala # for io.elementary.desktop.background
|
||||
gnome-desktop
|
||||
gnome-settings-daemon
|
||||
gdk-pixbuf
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
glib,
|
||||
glog,
|
||||
gflags,
|
||||
protobuf_29,
|
||||
protobuf_21,
|
||||
config,
|
||||
ocl-icd,
|
||||
qimgv,
|
||||
|
|
@ -29,7 +29,6 @@
|
|||
libwebp,
|
||||
enableEXR ? !stdenv.hostPlatform.isDarwin,
|
||||
openexr,
|
||||
ilmbase,
|
||||
enableJPEG2000 ? true,
|
||||
openjpeg,
|
||||
enableEigen ? true,
|
||||
|
|
@ -337,7 +336,7 @@ effectiveStdenv.mkDerivation {
|
|||
glib
|
||||
glog
|
||||
pcre2
|
||||
protobuf_29
|
||||
protobuf_21
|
||||
zlib
|
||||
]
|
||||
++ optionals enablePython [
|
||||
|
|
@ -369,7 +368,6 @@ effectiveStdenv.mkDerivation {
|
|||
]
|
||||
++ optionals enableEXR [
|
||||
openexr
|
||||
ilmbase
|
||||
]
|
||||
++ optionals enableJPEG2000 [
|
||||
openjpeg
|
||||
|
|
@ -462,8 +460,6 @@ effectiveStdenv.mkDerivation {
|
|||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
# Configure can't find the library without this.
|
||||
OpenBLAS_HOME = optionalString withOpenblas openblas_.dev;
|
||||
OpenBLAS = optionalString withOpenblas openblas_;
|
||||
|
|
@ -473,6 +469,7 @@ effectiveStdenv.mkDerivation {
|
|||
(cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
|
||||
(cmakeBool "WITH_OPENMP" true)
|
||||
(cmakeBool "BUILD_PROTOBUF" false)
|
||||
(cmakeBool "WITH_PROTOBUF" true)
|
||||
(cmakeBool "PROTOBUF_UPDATE_FILES" true)
|
||||
(cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
|
||||
(cmakeBool "BUILD_TESTS" runAccuracyTests)
|
||||
|
|
|
|||
70
pkgs/development/python-modules/scenedetect/default.nix
Normal file
70
pkgs/development/python-modules/scenedetect/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
av,
|
||||
click,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
opencv-python,
|
||||
platformdirs,
|
||||
tqdm,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
testsResources = fetchFromGitHub {
|
||||
owner = "Breakthrough";
|
||||
repo = "PySceneDetect";
|
||||
rev = "94389267a344785643980a2e0bb18179dcca01d3";
|
||||
hash = "sha256-7ws7F7CkEJAa0PgfMEOwnpF4Xl2BQCn9+qFQb5MMlZ0=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "scenedetect";
|
||||
version = "0.6.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Breakthrough";
|
||||
repo = "PySceneDetect";
|
||||
tag = "v${version}-release";
|
||||
hash = "sha256-G5NLk6eOpclfrzzHad2KT3uZqydSJU0oF/4L2NIdZe0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
av
|
||||
click
|
||||
numpy
|
||||
opencv-python
|
||||
platformdirs
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"scenedetect"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
cp -r ${testsResources}/tests/resources tests/
|
||||
chmod -R +w tests/resources
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
description = "Python and OpenCV-based scene cut/transition detection program & library";
|
||||
homepage = "https://www.scenedetect.com";
|
||||
changelog = "https://github.com/Breakthrough/PySceneDetect/releases/tag/v${version}-release";
|
||||
mainProgram = "scenedetect";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ DataHearth ];
|
||||
};
|
||||
}
|
||||
|
|
@ -863,7 +863,7 @@ if [ -z "$rollback" ]; then
|
|||
"let
|
||||
value = import \"$(realpath $buildFile)\";
|
||||
set = if builtins.isFunction value then value {} else value;
|
||||
in set.${attr:+$attr.}config.system.build.images.$imageVariant.v.passthru.filePath" \
|
||||
in set.${attr:+$attr.}config.system.build.images.$imageVariant.passthru.filePath" \
|
||||
"${extraBuildFlags[@]}" \
|
||||
| jq -r .
|
||||
)"
|
||||
|
|
|
|||
|
|
@ -9816,7 +9816,6 @@ with pkgs;
|
|||
# TODO: LTO does not work.
|
||||
# https://github.com/NixOS/nixpkgs/issues/343123
|
||||
enableLto = false;
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
opencv4WithoutCuda = opencv4.override {
|
||||
|
|
|
|||
|
|
@ -15368,6 +15368,8 @@ self: super: with self; {
|
|||
inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
|
||||
};
|
||||
|
||||
scenedetect = callPackage ../development/python-modules/scenedetect { };
|
||||
|
||||
schedule = callPackage ../development/python-modules/schedule { };
|
||||
|
||||
schema = callPackage ../development/python-modules/schema { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue