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,86 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
makeWrapper,
xorg,
getopt,
xauth,
util-linux,
which,
fontsConf,
gawk,
coreutils,
installShellFiles,
xterm,
bashNonInteractive,
}:
stdenvNoCC.mkDerivation {
pname = "xvfb-run";
version = "1+g87f6705";
src = fetchFromGitHub {
owner = "archlinux";
repo = "svntogit-packages";
rev = "87f67054c49b32511893acd22be94c47ecd44b4a";
sha256 = "sha256-KEg92RYgJd7naHFDKbdXEy075bt6NLcmX8VhQROHVPs=";
};
nativeBuildInputs = [
makeWrapper
installShellFiles
];
buildInputs = [
bashNonInteractive
];
strictDeps = true;
dontUnpack = true;
dontBuild = true;
dontConfigure = true;
installPhase = ''
mkdir -p $out/bin
cp $src/trunk/xvfb-run $out/bin/xvfb-run
installManPage $src/trunk/xvfb-run.1
chmod a+x $out/bin/xvfb-run
patchShebangs $out/bin/xvfb-run
wrapProgram $out/bin/xvfb-run \
--set-default FONTCONFIG_FILE "${fontsConf}" \
--prefix PATH : ${
lib.makeBinPath [
getopt
xorg.xvfb
xauth
which
util-linux
gawk
coreutils
]
}
'';
doInstallCheck = true;
installCheckPhase = ''
(
unset PATH
echo "running xterm with xvfb-run"
$out/bin/xvfb-run ${lib.getBin xterm}/bin/xterm -e true
)
'';
passthru = {
updateScript = ./update.sh;
};
meta = with lib; {
description = "Convenience script to run a virtualized X-Server";
platforms = platforms.linux;
license = licenses.gpl2Only;
maintainers = [ maintainers.artturin ];
mainProgram = "xvfb-run";
};
}

View File

@@ -0,0 +1,21 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix-prefetch jq common-updater-scripts
# shellcheck shell=bash
set -e
info=$(nix-prefetch-git --quiet --url "https://github.com/archlinux/svntogit-packages" --rev "refs/heads/packages/xorg-server")
rev=$(jq -r '.rev' <<< "$info")
sha256=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(jq -r '.sha256' <<< "$info")")
dir=$(jq -r '.path' <<< "$info")
newXvfbsha=$(sha256sum "$dir/trunk/xvfb-run")
oldXvfbsha=$(sha256sum "$(nix build --quiet ".#xvfb-run.src" --json --no-link | jq -r '.[].outputs.out')/trunk/xvfb-run")
if [[ "$newXvfbsha" != "$oldXvfbsha" ]]; then
(
cd "$(git rev-parse --show-toplevel)"
update-source-version xvfb-run "1+g${rev:0:7}" "$sha256" --rev="$rev"
)
fi