push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,23 @@
--- a/vcs 2020-04-04 14:37:53.531095977 -0700
+++ b/vcs 2020-04-04 14:40:46.459407878 -0700
@@ -3669,18 +3669,8 @@
[[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return
[[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return
[[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return
- # Try to locate DejaVu Sans
- local dvs=''
- if [[ -d /usr/local/share/fonts ]]; then
- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf')
- fi
- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then
- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf')
- fi
- if [[ -z $dvs ]]; then
- warn "Unable to locate DejaVu Sans font. Falling back to helvetica."
- dvs=helvetica
- fi
+ # Use DejaVu Sans, by default
+ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf'
[[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs"
[[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs"
[[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs"

View File

@@ -0,0 +1,60 @@
{
lib,
stdenv,
fetchurl,
makeWrapper,
coreutils,
ffmpeg,
gawk,
gnugrep,
gnused,
imagemagick,
mplayer,
util-linux,
getopt,
dejavu_fonts,
}:
let
version = "1.13.4";
gopt = if stdenv.hostPlatform.isLinux then util-linux else getopt;
runtimeDeps = [
coreutils
ffmpeg
gawk
gnugrep
gnused
imagemagick
mplayer
gopt
];
in
stdenv.mkDerivation {
pname = "vcs";
inherit version;
src = fetchurl {
url = "http://p.outlyer.net/files/vcs/vcs-${version}.bash";
sha256 = "0nhwcpffp3skz24kdfg4445i6j37ks6a0qsbpfd3dbi4vnpa60a0";
};
unpackCmd = "mkdir src; cp $curSrc src/vcs";
patches = [ ./fonts.patch ];
nativeBuildInputs = [ makeWrapper ];
inherit dejavu_fonts;
installPhase = ''
mkdir -p $out/bin
mv vcs $out/bin/vcs
substituteAllInPlace $out/bin/vcs
chmod +x $out/bin/vcs
wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${lib.makeBinPath runtimeDeps}"
'';
meta = with lib; {
description = "Generates contact sheets from video files";
homepage = "http://p.outlyer.net/vcs";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ elitak ];
platforms = with platforms; unix;
mainProgram = "vcs";
};
}