Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -16033,6 +16033,11 @@
|
||||
githubId = 1830959;
|
||||
name = "Piper McCorkle";
|
||||
};
|
||||
pitkling = {
|
||||
github = "pitkling";
|
||||
githubId = 1018801;
|
||||
name = "Peter Kling";
|
||||
};
|
||||
piturnah = {
|
||||
email = "peterhebden6@gmail.com";
|
||||
github = "Piturnah";
|
||||
@@ -21325,6 +21330,12 @@
|
||||
githubId = 8889722;
|
||||
name = "Vitomir Čanadi";
|
||||
};
|
||||
vcele = {
|
||||
email = "ejycebfx@duck.com";
|
||||
github = "Vcele";
|
||||
githubId = 101071881;
|
||||
name = "Victor";
|
||||
};
|
||||
vcunat = {
|
||||
name = "Vladimír Čunát";
|
||||
# vcunat@gmail.com predominated in commits before 2019/03
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
|
||||
- [ddns-updater](https://github.com/qdm12/ddns-updater), a service to update DNS records periodically with WebUI for many DNS providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable).
|
||||
|
||||
- [Immersed VR](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed-vr](#opt-programs.immersed-vr.enable).
|
||||
|
||||
- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).
|
||||
|
||||
- [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).
|
||||
|
||||
@@ -213,6 +213,7 @@
|
||||
./programs/iay.nix
|
||||
./programs/iftop.nix
|
||||
./programs/i3lock.nix
|
||||
./programs/immersed-vr.nix
|
||||
./programs/iotop.nix
|
||||
./programs/java.nix
|
||||
./programs/joycond-cemuhook.nix
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.immersed-vr;
|
||||
in
|
||||
{
|
||||
|
||||
options = {
|
||||
programs.immersed-vr = {
|
||||
enable = lib.mkEnableOption "immersed-vr";
|
||||
|
||||
package = lib.mkPackageOption pkgs "immersed-vr" {};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot = {
|
||||
kernelModules = [ "v4l2loopback" "snd-aloop" ];
|
||||
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
||||
extraModprobeConfig = ''
|
||||
options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera"
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = pkgs.immersed-vr.meta.maintainers;
|
||||
}
|
||||
@@ -30,21 +30,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0";
|
||||
x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy";
|
||||
aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9";
|
||||
aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c";
|
||||
armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr";
|
||||
x86_64-linux = "1q8krqhwlqj3a76hp830nhz27sqwz9i0klh2q2b3n5l29x9cvd34";
|
||||
x86_64-darwin = "1d0sp42g582ykzdpzmr1wqkc0ivg09l9zxm201fxd6irr6i6lvqz";
|
||||
aarch64-linux = "0z48qlz8b7mvznr4d4vi47mibkffbsmbr2bp712h1z9s4jhx40h4";
|
||||
aarch64-darwin = "01hmcnhpfdckaslz7133692n1haiq4ifbv72vbsdnzsrdxs7wd3m";
|
||||
armv7l-linux = "1ifd7z1mvimckb26l1nzv6qd3vjamfrzm0h655367d93fqz4iph4";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.91.1";
|
||||
version = "1.92.0";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729";
|
||||
rev = "b1c0a14de1414fcdaa400695b4db1c0799bc3124";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -68,7 +68,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg";
|
||||
sha256 = "03skx6cla4k5clncxx8wlp0j40gkqggqcs9wl0dqkrv18cljy5zz";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
ant,
|
||||
unzip,
|
||||
makeWrapper,
|
||||
jdk,
|
||||
jogl,
|
||||
rsync,
|
||||
ffmpeg,
|
||||
batik,
|
||||
stripJavaArchivesHook,
|
||||
wrapGAppsHook3,
|
||||
libGL,
|
||||
}:
|
||||
let
|
||||
buildNumber = "1293";
|
||||
vaqua = fetchurl {
|
||||
@@ -37,9 +53,11 @@ let
|
||||
sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
|
||||
};
|
||||
|
||||
arch = {
|
||||
x86_64 = "amd64";
|
||||
}.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
|
||||
arch =
|
||||
{
|
||||
x86_64 = "amd64";
|
||||
}
|
||||
.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "processing";
|
||||
@@ -52,8 +70,21 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ];
|
||||
buildInputs = [ jdk jogl ant rsync ffmpeg batik ];
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
unzip
|
||||
makeWrapper
|
||||
stripJavaArchivesHook
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
jdk
|
||||
jogl
|
||||
ant
|
||||
rsync
|
||||
ffmpeg
|
||||
batik
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
@@ -74,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||
mv app/lib/{jna-5.10.0/dist/jna.jar,}
|
||||
mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
|
||||
ln -sf ${batik}/* java/libraries/svg/library/
|
||||
cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
|
||||
cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
|
||||
echo "tarring ffmpeg"
|
||||
tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
|
||||
cd build
|
||||
@@ -108,7 +139,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Language and IDE for electronic arts";
|
||||
homepage = "https://processing.org";
|
||||
license = with licenses; [ gpl2Only lgpl21Only ];
|
||||
license = with licenses; [
|
||||
gpl2Only
|
||||
lgpl21Only
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ evan-goode ];
|
||||
};
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "127.0.2651.49";
|
||||
version = "127.0.2651.61";
|
||||
revision = "1";
|
||||
hash = "sha256-fMB7CuC5u8RNbbtFEZWFIIBwZTPkTP9LVs7DCXltGEA=";
|
||||
hash = "sha256-M67QOKZF4+dGCdyKfe5EF5K4A6bip2/a4J1k7+v3QMQ=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "128.0.2677.1";
|
||||
version = "128.0.2708.0";
|
||||
revision = "1";
|
||||
hash = "sha256-aKrNs44FZNhC/fGT1UvyE2Fx8Q53ahAu91Bu86E49o8=";
|
||||
hash = "sha256-QFtVQTcbiF165/Xqmo8kAoo4kQegqqzMVcr8mQiraH8=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "126.0.2592.102";
|
||||
version = "126.0.2592.113";
|
||||
revision = "1";
|
||||
hash = "sha256-xCjtsZoetxlOV77VSbt09cGbpfHUYhTA6WXuZAvD/a4=";
|
||||
hash = "sha256-wSNXCUTG9eCnqe5Ir8pE8Z7zuY2KsDgTLKKTAQeXS2s=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, cmake
|
||||
, ffmpeg
|
||||
, fribidi
|
||||
, game-music-emu
|
||||
, libXdmcp
|
||||
, libXv
|
||||
, libass
|
||||
, libcddb
|
||||
, libcdio
|
||||
, libpulseaudio
|
||||
, libsidplayfp
|
||||
, libva
|
||||
, libxcb
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qttools
|
||||
, taglib
|
||||
, vulkan-headers
|
||||
, vulkan-tools
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qmplay2";
|
||||
version = "24.04.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QMPlay2";
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
ffmpeg
|
||||
fribidi
|
||||
game-music-emu
|
||||
libXdmcp
|
||||
libXv
|
||||
libass
|
||||
libcddb
|
||||
libcdio
|
||||
libpulseaudio
|
||||
libsidplayfp
|
||||
libva
|
||||
libxcb
|
||||
qtbase
|
||||
qttools
|
||||
taglib
|
||||
vulkan-headers
|
||||
vulkan-tools
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Because we think it is better to use only lowercase letters!
|
||||
ln -s $out/bin/QMPlay2 $out/bin/qmplay2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/zaps166/QMPlay2/";
|
||||
description = "Qt-based Multimedia player";
|
||||
longDescription = ''
|
||||
QMPlay2 is a video and audio player. It can play all formats supported by
|
||||
FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw
|
||||
files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3
|
||||
browser.
|
||||
'';
|
||||
changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres kashw2 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RcMmW1+XbQSVeaYnK7y8/WdQLYOIozyt9OCDAsSZ3HU=";
|
||||
hash = "sha256-zbQlmxrvA2rZLEGmhj7MkVP5SmJdhhL9F3wRrB97DJs=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.0.15";
|
||||
version = "1.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SpkhOztUh28N853+6BBQnVRBgphxJARLJXQzmXJwPyY=";
|
||||
hash = "sha256-0c6iJMSB9ThJVookibZL5CoAhrVMtY6oHYn92nN0114=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
which,
|
||||
unixtools,
|
||||
cctools,
|
||||
ffmpeg,
|
||||
libjpeg,
|
||||
libpng,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "harvid";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "harvid";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
which
|
||||
unixtools.xxd
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
libjpeg
|
||||
libpng
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace libharvid/Makefile \
|
||||
--replace-fail /usr/bin/libtool ${cctools}/bin/libtool
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"VERSION=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Decodes still images from movie files and serves them via HTTP";
|
||||
longDescription = ''
|
||||
harvid's intended use-case is to efficiently provide frame-accurate data
|
||||
and act as second level cache for rendering the video-timeline in Ardour,
|
||||
but it is not limited to that: it has applications for any task that
|
||||
requires a high-performance frame-accurate online image extraction
|
||||
processor.
|
||||
'';
|
||||
homepage = "http://x42.github.io/harvid";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.mitchmindtree ];
|
||||
mainProgram = "harvid";
|
||||
};
|
||||
})
|
||||
@@ -26,7 +26,7 @@ let
|
||||
description = "VR coworking platform";
|
||||
homepage = "https://immersed.com";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ haruki7049 ];
|
||||
maintainers = with maintainers; [ haruki7049 pandapip1 ];
|
||||
platforms = builtins.attrNames sources;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "irpf";
|
||||
version = "2024-1.2";
|
||||
version = "2024-1.3";
|
||||
|
||||
# https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
|
||||
# Para outros sistemas operacionais -> Multi
|
||||
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
year = lib.head (lib.splitVersion finalAttrs.version);
|
||||
in fetchzip {
|
||||
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
|
||||
hash = "sha256-gwYWNnvpGej9B1EyFswYGYXh4i4wiyOG67VN1PWX3A0=";
|
||||
hash = "sha256-UMzoQSSlmOi7TIqPF0vfeelum5JSa6ne4c7ZFREuDr8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update-irpf" ''
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
fetchzip,
|
||||
lib,
|
||||
libfprint-tod,
|
||||
openssl,
|
||||
patchelfUnstable, # have to use patchelfUnstable to support --rename-dynamic-symbols
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
# Based on ideas from (using a wrapper library to redirect fopen() calls to firmware files):
|
||||
# * https://tapesoftware.net/replace-symbol/
|
||||
# * https://github.com/NixOS/nixpkgs/pull/260715
|
||||
let
|
||||
pname = "libfprint-2-tod1-broadcom";
|
||||
version = "5.12.018";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://dell.archive.canonical.com/updates/pool/public/libf/${pname}/${pname}_${version}.orig.tar.gz";
|
||||
hash = "sha256-0C2PpYpEJNrU+8NT95w4QV0J5nHQisMY94Czw3jQOzw=";
|
||||
pname = "${pname}-unpacked";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
wrapperLibName = "wrapper-lib.so";
|
||||
wrapperLibSource = "wrapper-lib.c";
|
||||
|
||||
# wraps `fopen()` for finding firmware files
|
||||
wrapperLib = stdenv.mkDerivation {
|
||||
pname = "${pname}-wrapper-lib";
|
||||
inherit version;
|
||||
|
||||
src = builtins.path {
|
||||
name = "${pname}-wrapper-lib-source";
|
||||
path = ./.;
|
||||
filter = path: type: baseNameOf path == wrapperLibSource;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substitute ${wrapperLibSource} lib.c \
|
||||
--subst-var-by to "${src}/var/lib/fprint/fw"
|
||||
cc -fPIC -shared lib.c -o ${wrapperLibName}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D -t $out/lib ${wrapperLibName}
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit src pname version;
|
||||
|
||||
buildInputs = [
|
||||
libfprint-tod
|
||||
openssl
|
||||
wrapperLib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
patchelfUnstable
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D -t "$out/lib/libfprint-2/tod-1/" -m 644 -v usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-2-tod-1-broadcom.so
|
||||
install -D -t "$out/lib/udev/rules.d/" -m 644 -v lib/udev/rules.d/60-libfprint-2-device-broadcom.rules
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
echo fopen64 fopen_wrapper > fopen_name_map
|
||||
patchelf \
|
||||
--rename-dynamic-symbols fopen_name_map \
|
||||
--add-needed ${wrapperLibName} \
|
||||
"$out/lib/libfprint-2/tod-1/libfprint-2-tod-1-broadcom.so"
|
||||
'';
|
||||
|
||||
passthru.driverPath = "/lib/libfprint-2/tod-1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver (from Dell)";
|
||||
homepage = "http://dell.archive.canonical.com/updates/pool/public/libf/libfprint-2-tod1-broadcom/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ pitkling ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static const char from[] = "/var/lib/fprint/fw";
|
||||
static const char to[] = "@to@";
|
||||
|
||||
FILE* fopen_wrapper(const char* fn, const char* mode) {
|
||||
size_t fn_len = strlen(fn);
|
||||
size_t from_len = strlen(from);
|
||||
if (fn_len > from_len && memcmp(fn, from, from_len) == 0) {
|
||||
size_t to_len = strlen(to);
|
||||
char* rewritten = calloc(fn_len + (to_len - from_len) + 1, 1);
|
||||
memcpy(rewritten, to, to_len);
|
||||
memcpy(rewritten + to_len, fn + from_len, fn_len - from_len);
|
||||
|
||||
printf("fopen_wrapper.c: Replacing path '%s' with '%s'\n", fn, rewritten);
|
||||
FILE* result = fopen(rewritten, mode);
|
||||
free(rewritten);
|
||||
return result;
|
||||
}
|
||||
return fopen(fn, mode);
|
||||
}
|
||||
@@ -77,7 +77,7 @@ lib.fix (
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Libraries to write tests in C, C++, and shell";
|
||||
description = "Lightweight C++ API for Lua";
|
||||
homepage = "https://github.com/freebsd/lutok/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ reckenrode ];
|
||||
|
||||
@@ -5,22 +5,25 @@
|
||||
nix-update-script,
|
||||
phraze,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "phraze";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sts10";
|
||||
repo = "phraze";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lW7oYivIDGYg78MgcLFFNyxciVk+wKU/OBzWYx3KwPI=";
|
||||
hash = "sha256-xjkS1Ehqh2LfuIwAtj6V7Q9DcuERk7PyJKJEuDE7A34=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
cargoHash = "sha256-kFk04YKDYiABWtild6aaP9H8gt/TuckOWRJE69dAXGU=";
|
||||
cargoHash = "sha256-jsQlcGRZqa4HHUS3Xc9OZUbI6pHalt9A3fVaz+Th1l0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
@@ -29,12 +32,24 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installManPage target/man/phraze.1
|
||||
|
||||
installShellCompletion --cmd phraze \
|
||||
--bash target/completions/phraze.bash \
|
||||
--fish target/completions/phraze.fish \
|
||||
--zsh target/completions/_phraze
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Generate random passphrases";
|
||||
homepage = "https://github.com/sts10/phraze";
|
||||
changelog = "https://github.com/sts10/phraze/releases/tag/v${version}";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ x123 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
x123
|
||||
donovanglover
|
||||
];
|
||||
mainProgram = "phraze";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
{
|
||||
lib,
|
||||
alsa-lib,
|
||||
callPackage,
|
||||
cmake,
|
||||
ffmpeg,
|
||||
fribidi,
|
||||
game-music-emu,
|
||||
libXdmcp,
|
||||
libXv,
|
||||
libass,
|
||||
libcddb,
|
||||
libcdio,
|
||||
libpulseaudio,
|
||||
libsidplayfp,
|
||||
libva,
|
||||
libxcb,
|
||||
ninja,
|
||||
pkg-config,
|
||||
qt5,
|
||||
qt6,
|
||||
stdenv,
|
||||
taglib,
|
||||
vulkan-headers,
|
||||
vulkan-tools,
|
||||
# Configurable options
|
||||
qtVersion ? "6", # Can be 5 or 6
|
||||
}:
|
||||
|
||||
let
|
||||
sources = callPackage ./sources.nix { };
|
||||
in
|
||||
assert lib.elem qtVersion [
|
||||
"5"
|
||||
"6"
|
||||
];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = sources.qmplay2.pname + "-qt" + qtVersion;
|
||||
inherit (sources.qmplay2) version src;
|
||||
|
||||
postPatch = ''
|
||||
pushd src
|
||||
cp -va ${sources.qmvk.src}/* qmvk/
|
||||
chmod --recursive 744 qmvk
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals (qtVersion == "6") [ qt6.wrapQtAppsHook ]
|
||||
++ lib.optionals (qtVersion == "5") [ qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
alsa-lib
|
||||
ffmpeg
|
||||
fribidi
|
||||
game-music-emu
|
||||
libXdmcp
|
||||
libXv
|
||||
libass
|
||||
libcddb
|
||||
libcdio
|
||||
libpulseaudio
|
||||
libsidplayfp
|
||||
libva
|
||||
libxcb
|
||||
taglib
|
||||
vulkan-headers
|
||||
vulkan-tools
|
||||
]
|
||||
++ lib.optionals (qtVersion == "6") [
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
]
|
||||
++ lib.optionals (qtVersion == "5") [
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# Because we think it is better to use only lowercase letters!
|
||||
# But sometimes we come across case-insensitive filesystems...
|
||||
postInstall = ''
|
||||
[ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit sources;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/zaps166/QMPlay2/";
|
||||
description = "Qt-based Multimedia player";
|
||||
longDescription = ''
|
||||
QMPlay2 is a video and audio player. It can play all formats supported by
|
||||
FFmpeg and libmodplug (including J2B and SFX). It also supports Audio CD,
|
||||
raw files, Rayman 2 music, and chiptunes. It also contains YouTube and
|
||||
MyFreeMP3 browser.
|
||||
'';
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
mainProgram = "qmplay2";
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
kashw2
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,31 @@
|
||||
{ fetchFromGitHub }:
|
||||
|
||||
{
|
||||
qmplay2 =
|
||||
let
|
||||
self = {
|
||||
pname = "qmplay2";
|
||||
version = "24.06.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QMPlay2";
|
||||
rev = self.version;
|
||||
hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
|
||||
};
|
||||
};
|
||||
in
|
||||
self;
|
||||
|
||||
qmvk = {
|
||||
pname = "qmvk";
|
||||
version = "0-unstable-2024-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QmVk";
|
||||
rev = "5c5c2942255820b6343afdfeea0405cd3b36870e";
|
||||
hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw=";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "redocly";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Redocly";
|
||||
repo = "redocly-cli";
|
||||
rev = "@redocly/cli@${version}";
|
||||
hash = "sha256-Wcnq6hOgZb/HjTL1vb70d69LwFqRsBrgWHKyjYnauEg=";
|
||||
hash = "sha256-Y09tGm3Sje8gd+6tUyBTCt7HjL2CQ/vo/ExLDnywvcQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-mHwabPif4B1kzqA5Y9WBEr17c3tg0IsBGcRcWnQqGD0=";
|
||||
npmDepsHash = "sha256-WzMFKMW/YyAH3ZoOeIcXIum15cJmPGp96xSYb9QCaWI=";
|
||||
|
||||
npmBuildScript = "prepare";
|
||||
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ryzen-monitor-ng";
|
||||
@@ -11,29 +16,24 @@ stdenv.mkDerivation {
|
||||
owner = "plasmin";
|
||||
repo = "ryzen_monitor_ng";
|
||||
rev = "8b7854791d78de731a45ce7d30dd17983228b7b1";
|
||||
hash = "sha256-fcW2fEsCFliRnMFnboR0jchzVIlCYbr2AE6AS06cb6o=";
|
||||
hash = "sha256-xdYNtXCbNy3/y5OAHZEi9KgPtwr1LTtLWAZC5DDCfmE=";
|
||||
# Upstream repo contains pre-compiled binaries and object files
|
||||
# that are out of date.
|
||||
# These need to be removed before build stage.
|
||||
postFetch = ''
|
||||
rm "$out/src/ryzen_monitor"
|
||||
make -C "$out" clean
|
||||
'';
|
||||
};
|
||||
|
||||
## Remove binaries committed into upstream repo
|
||||
preBuild = ''
|
||||
rm src/ryzen_monitor
|
||||
'';
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
makeTargets = [ "clean" "install" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv ./src/ryzen_monitor $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Access Ryzen SMU information exposed by the ryzen_smu driver";
|
||||
homepage = "https://github.com/mann1x/ryzen_monitor_ng";
|
||||
changelog = "https://github.com/mann1x/ryzen_monitor_ng/blob/master/CHANGELOG.md";
|
||||
homepage = "https://github.com/plasmin/ryzen_monitor_ng";
|
||||
changelog = "https://github.com/plasmin/ryzen_monitor_ng/blob/master/CHANGELOG.md";
|
||||
license = licenses.agpl3Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ phdyellow ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, mongoc
|
||||
, openssl
|
||||
@@ -7,23 +7,26 @@
|
||||
, cmake
|
||||
, validatePkgConfig
|
||||
, testers
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mongocxx";
|
||||
version = "3.8.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-cxx-driver";
|
||||
rev = "refs/tags/r${finalAttrs.version}";
|
||||
hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4=";
|
||||
hash = "sha256-nGLE0vyCe3PaNJf3duXdBfAhTdRvdeQ+OCwcaSDxi5Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/bsoncxx/config/CMakeLists.txt \
|
||||
src/mongocxx/config/CMakeLists.txt \
|
||||
--replace "\\\''${prefix}/" ""
|
||||
substituteInPlace src/bsoncxx/cmake/libbsoncxx.pc.in \
|
||||
src/mongocxx/cmake/libmongocxx.pc.in \
|
||||
--replace "\''${prefix}/" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mongoc
|
||||
openssl
|
||||
cyrus_sasl
|
||||
];
|
||||
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_STANDARD=20"
|
||||
@@ -49,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Official C++ client library for MongoDB";
|
||||
homepage = "http://mongocxx.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adriandole ];
|
||||
maintainers = with maintainers; [ adriandole vcele ];
|
||||
pkgConfigModules = [ "libmongocxx" "libbsoncxx" ];
|
||||
platforms = platforms.all;
|
||||
badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dploot";
|
||||
version = "2.7.3";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YlRXUSCzVRXxRQcmPzTeyPQ3zK+UlhO9BmZVx6qVRpc=";
|
||||
hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "githubkit";
|
||||
version = "0.11.7";
|
||||
version = "0.11.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "yanyongyu";
|
||||
repo = "githubkit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bh01m/L1ubQGc4EoHw8If/6yF64M5CsifSwVezZjFDQ=";
|
||||
hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linear-garage-door";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "IceBotYT";
|
||||
repo = "linear-garage-door";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hWWJgZnEItYaSxka7zBHPeVlTEiOqRnA2vg6/MvpJGE=";
|
||||
hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -29,9 +29,9 @@ buildPythonPackage rec {
|
||||
-e "/--no-cov/d"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
dnspython
|
||||
tenacity
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plantuml-markdown";
|
||||
version = "3.9.8";
|
||||
version = "3.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "mikitex70";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gBlHWAD8MIymCqtqxKRneScMztFzPStIMIO+IrHpgpc=";
|
||||
hash = "sha256-t5OZ0n2TLQFaGievFWlYTXslP4yCvpQ3MyNQZ3/xYRs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recline";
|
||||
version = "2024.6";
|
||||
version = "2024.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetApp";
|
||||
repo = "recline";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-wVUM5vkavdLDtwRlbtVlVaBOXX+7tcB+SxYe1jZdq9I=";
|
||||
sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wagtail";
|
||||
version = "6.1.3";
|
||||
version = "6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-j0kIqxtrljqKp6348OxzjNHcebmBbG1fWQGPYApAQ3g=";
|
||||
hash = "sha256-WQhujKGBsQ8nSxE5JFAFBN7W/BaCTBl283w8vd0QDSQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xdoctest";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Erotemic";
|
||||
repo = "xdoctest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lC4xX5V5iasQdR4tkLEvtMe/OjSp6+A7D2QGX6TFY4E=";
|
||||
hash = "sha256-L/RtD/e0ubW3j4623HQGfowXQYZjl7dDfwwbfxm3ll8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yolink-api";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "YoSmart-Inc";
|
||||
repo = "yolink-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qavVdIcOaCdODceok5tTobSWpPzuLvbzaFYkOVjD+9A=";
|
||||
hash = "sha256-A5cFz1u2b6mlE4NtMRQU3lruNqNWTYXH+tMvkH/zfUw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ttz1D/jFbxFfpbT2VAkcao2AFwFRD8PLrH8yDSYt3AI=";
|
||||
hash = "sha256-WT1ij2jDEKavYREYYYKl6H27QOuGDAxnWSz+mbvJ5UA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
# the version of infisical
|
||||
version = "0.25.0";
|
||||
version = "0.26.1";
|
||||
|
||||
# the platform-specific, statically linked binary
|
||||
src =
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
|
||||
, "x86_64-linux": "sha256-BpOobdWp+pt9zb/OemrUGXv9TbGlzNWjQM3Oe+55W8Q="
|
||||
, "x86_64-darwin": "sha256-Lr8B6TI9kffQHLgYtoctcVFHdBPTU6DcMETqxaqVNqU="
|
||||
, "aarch64-linux": "sha256-Jq6NOhZR57Thbq2cnHjJXVU00zhZF8UCJTCEBo6DT64="
|
||||
, "aarch64-darwin": "sha256-6htS81iK3L90mWS/exTHg8C7agPx5XH+6VBj+AN4X0o="
|
||||
, "x86_64-linux": "sha256-53Nk24THJ16elOTuPkXohxvLeSn1cXyI8PIogpg7b2g="
|
||||
, "x86_64-darwin": "sha256-iO/WPfLSmYQJRuuPSfXbrb1p75czP4FQkc3ryQ/PWF4="
|
||||
, "aarch64-linux": "sha256-7FCxF6M9J6NYTeXw98uu3GjWsXsTZ+eQdKgbutGKDtI="
|
||||
, "aarch64-darwin": "sha256-lV2jye63ZWlMIa41+xbfe39kBHKwnXtNsBlM+WZvWhQ="
|
||||
}
|
||||
|
||||
@@ -7,27 +7,32 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pebble";
|
||||
version = "2.4.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letsencrypt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m";
|
||||
hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.acme;
|
||||
};
|
||||
|
||||
meta = {
|
||||
# ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint
|
||||
broken = stdenv.hostPlatform.is32bit;
|
||||
homepage = "https://github.com/letsencrypt/pebble";
|
||||
description = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
|
||||
description = "Small RFC 8555 ACME test server";
|
||||
longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
|
||||
license = [ lib.licenses.mpl20 ];
|
||||
mainProgram = "pebble";
|
||||
maintainers = lib.teams.acme.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "wootility";
|
||||
version = "4.6.20";
|
||||
version = "4.6.21";
|
||||
src = fetchurl {
|
||||
url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage";
|
||||
sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk=";
|
||||
sha256 = "sha256-ockTQLZWbYvsLzv+D0exD5W/yMaIdse4/JQshbkVzAU=";
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "harvid";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "harvid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion to support parallel builds:
|
||||
# https://github.com/x42/harvid/pull/10
|
||||
(fetchpatch {
|
||||
name = "parallel-build.patch";
|
||||
url = "https://github.com/x42/harvid/commit/a3f85c57ad2559558706d9b22989de36452704d9.patch";
|
||||
sha256 = "sha256-0aBfM/4XEqM7C1nFw996IVwaeL0tNgMUQ1C3kblOobI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ ffmpeg_4 libjpeg libpng ];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mv $out/usr/local/bin/* $out/bin
|
||||
mv $out/usr/local/share $out/
|
||||
rm -r $out/usr
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Decodes still images from movie files and serves them via HTTP";
|
||||
longDescription = ''
|
||||
harvid's intended use-case is to efficiently provide frame-accurate data
|
||||
and act as second level cache for rendering the video-timeline in Ardour,
|
||||
but it is not limited to that: it has applications for any task that
|
||||
requires a high-performance frame-accurate online image extraction
|
||||
processor.
|
||||
'';
|
||||
homepage = "http://x42.github.io/harvid";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mitchmindtree ];
|
||||
mainProgram = "harvid";
|
||||
};
|
||||
}
|
||||
@@ -3812,8 +3812,6 @@ with pkgs;
|
||||
|
||||
harsh = callPackage ../applications/misc/harsh { };
|
||||
|
||||
harvid = callPackage ../tools/video/harvid { };
|
||||
|
||||
headset = callPackage ../applications/audio/headset { };
|
||||
|
||||
hilbish = callPackage ../shells/hilbish { };
|
||||
@@ -33298,7 +33296,8 @@ with pkgs;
|
||||
|
||||
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
|
||||
|
||||
qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
|
||||
qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
|
||||
qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
|
||||
|
||||
qmidiarp = callPackage ../applications/audio/qmidiarp { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user