treewide: fix things up for new nixpkgs
This commit is contained in:
parent
83d8a1b245
commit
e03ae8b853
37 changed files with 59 additions and 60 deletions
|
@ -23,7 +23,7 @@ let
|
|||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ];
|
||||
});
|
||||
xmlsec = super.xmlsec.overridePythonAttrs (old: {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.pkgconfig pkgs.pkg-config ];
|
||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.pkg-config ];
|
||||
buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ];
|
||||
});
|
||||
mistune = super.mistune.overridePythonAttrs (old: rec {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# If you run pynixify again, the file will be either overwritten or
|
||||
# deleted, and you will lose the changes you made to it.
|
||||
|
||||
{ buildPythonPackage, celery, dateutil, fetchPypi, lib, redis, tenacity }:
|
||||
{ buildPythonPackage, celery, python-dateutil, fetchPypi, lib, redis, tenacity }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery-redbeat";
|
||||
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
sha256 = "030r39cmn2lfm1ysyvnya0ys63sfqwlk130qsdnndwjxpr0nk3fb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ redis celery dateutil tenacity ];
|
||||
propagatedBuildInputs = [ redis celery python-dateutil tenacity ];
|
||||
|
||||
# TODO FIXME
|
||||
doCheck = false;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# If you run pynixify again, the file will be either overwritten or
|
||||
# deleted, and you will lose the changes you made to it.
|
||||
|
||||
{ buildPythonPackage, dateutil, fetchPypi, lib, text-unidecode }:
|
||||
{ buildPythonPackage, python-dateutil, fetchPypi, lib, text-unidecode }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faker";
|
||||
|
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||
sha256 = "14bqdb7wngxlr9n25syab6i7dr9xjkxlq0wy31aar8yxlffixs5r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dateutil text-unidecode ];
|
||||
propagatedBuildInputs = [ python-dateutil text-unidecode ];
|
||||
|
||||
# TODO FIXME
|
||||
doCheck = false;
|
||||
|
|
|
@ -6,7 +6,7 @@ let
|
|||
hash = "sha256:0h3i5jbqc40sxysq20l3ky0vxbn28avhm6fh6bv3bmar4lx1azcm";
|
||||
};
|
||||
in
|
||||
pkgs.runCommandNoCC "hp-rom" {
|
||||
pkgs.runCommand "hp-rom" {
|
||||
inherit bl465c;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -20,7 +20,5 @@ buildGoPackage rec {
|
|||
|
||||
passthru.tests = null;
|
||||
|
||||
meta = prometheus-bird-exporter.meta // {
|
||||
url = "https://scm.linefinity.com/common/prometheus-bird-exporter-lfty";
|
||||
};
|
||||
inherit (prometheus-bird-exporter) meta;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@ pkgs.stdenv.mkDerivation rec {
|
|||
sourceRoot = "writable/SheepShaver/src/Unix";
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
autoconf automake file perl pkgconfig
|
||||
autoconf automake file perl pkg-config
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
|
|
|
@ -4,7 +4,7 @@ let
|
|||
mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: {
|
||||
propagatedBuildInputs = [pkgs.python3Packages.hg-evolve];
|
||||
}));
|
||||
updateNixpkgs = pkgs.runCommandNoCC "update_nixpkgs" {
|
||||
updateNixpkgs = pkgs.runCommand "update_nixpkgs" {
|
||||
buildInputs = with pkgs; [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
|
@ -27,7 +27,7 @@ pkgs.dockerTools.buildImage {
|
|||
|
||||
contents = [
|
||||
pkgs.cacert updateNixpkgs
|
||||
(pkgs.runCommandNoCC "update_nixpkgs_content" {} ''
|
||||
(pkgs.runCommand "update_nixpkgs_content" {} ''
|
||||
mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp
|
||||
chmod 700 $out/root $out/root/.ssh
|
||||
chmod 1777 $out/tmp
|
||||
|
|
|
@ -179,7 +179,7 @@ in {
|
|||
chmod -R u=rwX,go= /srv/gitlab-runner/.ssh
|
||||
'';
|
||||
environment.systemPackages = with pkgs; [
|
||||
vim rxvt_unicode.terminfo kitty.terminfo rsync jq
|
||||
vim rxvt-unicode-unwrapped.terminfo kitty.terminfo rsync jq
|
||||
depot.nix.pkgs.heptapod-runner-mercurial
|
||||
];
|
||||
};
|
||||
|
|
|
@ -137,7 +137,7 @@ in
|
|||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
vim rxvt_unicode.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic
|
||||
vim rxvt-unicode-unwrapped.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic
|
||||
alacritty.terminfo kitty.terminfo
|
||||
iftop htop jq
|
||||
depot.nix.pkgs.mercurial
|
||||
|
|
|
@ -133,7 +133,7 @@ in
|
|||
#!/bin/sh
|
||||
exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@"
|
||||
'')
|
||||
rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic
|
||||
rxvt-unicode-unwrapped.terminfo tmux rsync libarchive tcpdump restic
|
||||
alacritty.terminfo kitty.terminfo
|
||||
iftop htop jq
|
||||
depot.nix.pkgs.mercurial
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
depot.nix.pkgs.lutris
|
||||
pavucontrol
|
||||
pngquant
|
||||
rxvt_unicode
|
||||
rxvt-unicode
|
||||
teamspeak_client
|
||||
virtmanager
|
||||
virt-manager
|
||||
xclip
|
||||
xss-lock
|
||||
yubioath-desktop
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
{ depot, pkgs, ... }:
|
||||
|
||||
pkgs.runCommandNoCC "raritan-update" {
|
||||
pkgs.runCommand "raritan-update" {
|
||||
inherit (pkgs) curl jq;
|
||||
} ''
|
||||
mkdir $out
|
||||
|
|
3
third_party/default.nix
vendored
3
third_party/default.nix
vendored
|
@ -6,6 +6,7 @@
|
|||
let
|
||||
nixpkgsConfig = {
|
||||
allowUnfree = true;
|
||||
checkMeta = false;
|
||||
permittedInsecurePackages = [
|
||||
"p7zip-16.02"
|
||||
];
|
||||
|
@ -36,7 +37,7 @@ let
|
|||
sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
|
||||
};
|
||||
|
||||
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; };
|
||||
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; };
|
||||
in
|
||||
rec {
|
||||
inherit nixpkgsConfig nixpkgs;
|
||||
|
|
2
third_party/tvl/corp/website/default.nix
vendored
2
third_party/tvl/corp/website/default.nix
vendored
|
@ -31,7 +31,7 @@ let
|
|||
'';
|
||||
};
|
||||
in
|
||||
pkgs.runCommandNoCC "corp-website" { } ''
|
||||
pkgs.runCommand "corp-website" { } ''
|
||||
mkdir $out
|
||||
cp ${index} $out/index.html
|
||||
''
|
||||
|
|
4
third_party/tvl/fun/gemma/default.nix
vendored
4
third_party/tvl/fun/gemma/default.nix
vendored
|
@ -1,7 +1,7 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText;
|
||||
inherit (pkgs) cacert iana-etc libredirect stdenv runCommand writeText;
|
||||
elmPackages = depot.third_party.elmPackages_0_18;
|
||||
|
||||
frontend = stdenv.mkDerivation {
|
||||
|
@ -28,7 +28,7 @@ let
|
|||
|
||||
injectFrontend = writeText "gemma-frontend.lisp" ''
|
||||
(in-package :gemma)
|
||||
(setq *static-file-location* "${runCommandNoCC "frontend" {} ''
|
||||
(setq *static-file-location* "${runCommand "frontend" {} ''
|
||||
mkdir -p $out
|
||||
cp ${frontend} $out/index.html
|
||||
''}/")
|
||||
|
|
10
third_party/tvl/nix/buildLisp/default.nix
vendored
10
third_party/tvl/nix/buildLisp/default.nix
vendored
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
inherit (builtins) map elemAt match filter;
|
||||
inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl;
|
||||
inherit (pkgs) lib runCommand makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl;
|
||||
inherit (pkgs.stdenv) targetPlatform;
|
||||
|
||||
#
|
||||
|
@ -187,7 +187,7 @@ let
|
|||
lispNativeDeps = allNative native lispDeps;
|
||||
filteredSrcs = implFilter implementation srcs;
|
||||
in
|
||||
runCommandNoCC name
|
||||
runCommand name
|
||||
{
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
|
||||
LANG = "C.UTF-8";
|
||||
|
@ -475,7 +475,7 @@ let
|
|||
} $@
|
||||
'';
|
||||
|
||||
bundled = name: runCommandNoCC "${name}-cllib"
|
||||
bundled = name: runCommand "${name}-cllib"
|
||||
{
|
||||
passthru = {
|
||||
lispName = name;
|
||||
|
@ -640,7 +640,7 @@ let
|
|||
}
|
||||
else null;
|
||||
in
|
||||
lib.fix (self: runCommandNoCC "${name}-cllib"
|
||||
lib.fix (self: runCommand "${name}-cllib"
|
||||
{
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
|
||||
LANG = "C.UTF-8";
|
||||
|
@ -707,7 +707,7 @@ let
|
|||
}
|
||||
else null;
|
||||
in
|
||||
lib.fix (self: runCommandNoCC "${name}"
|
||||
lib.fix (self: runCommand "${name}"
|
||||
{
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
LD_LIBRARY_PATH = libPath;
|
||||
|
|
4
third_party/tvl/nix/buildkite/default.nix
vendored
4
third_party/tvl/nix/buildkite/default.nix
vendored
|
@ -28,7 +28,7 @@ let
|
|||
toJSON
|
||||
unsafeDiscardStringContext;
|
||||
|
||||
inherit (pkgs) lib runCommandNoCC writeText;
|
||||
inherit (pkgs) lib runCommand writeText;
|
||||
inherit (depot.nix.readTree) mkLabel;
|
||||
in
|
||||
rec {
|
||||
|
@ -206,7 +206,7 @@ rec {
|
|||
postBuildChunks = pipelineChunks "post" postSteps;
|
||||
chunks = buildChunks ++ postBuildChunks;
|
||||
in
|
||||
runCommandNoCC "buildkite-pipeline" { } ''
|
||||
runCommand "buildkite-pipeline" { } ''
|
||||
mkdir $out
|
||||
echo "Generated ${toString (length chunks)} pipeline chunks"
|
||||
${
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
|
||||
with depot.nix.yants;
|
||||
|
||||
defun [ path drv ] (file: pkgs.runCommandNoCC "${file}.rendered.html" { } ''
|
||||
defun [ path drv ] (file: pkgs.runCommand "${file}.rendered.html" { } ''
|
||||
cat ${file} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${file} > $out
|
||||
'')
|
||||
|
|
2
third_party/tvl/nix/sparseTree/default.nix
vendored
2
third_party/tvl/nix/sparseTree/default.nix
vendored
|
@ -64,7 +64,7 @@ in
|
|||
|
||||
# TODO(sterni): teach readTree to also read symlinked directories,
|
||||
# so we ln -sT instead of cp -aT.
|
||||
pkgs.runCommandNoCC "sparse-${builtins.baseNameOf root}" { } (
|
||||
pkgs.runCommand "sparse-${builtins.baseNameOf root}" { } (
|
||||
lib.concatMapStrings
|
||||
({ src, dst }: ''
|
||||
mkdir -p "$(dirname "$out${dst}")"
|
||||
|
|
2
third_party/tvl/ops/dns/default.nix
vendored
2
third_party/tvl/ops/dns/default.nix
vendored
|
@ -2,7 +2,7 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" { } ''
|
||||
checkZone = zone: file: pkgs.runCommand "${zone}-check" { } ''
|
||||
${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
|
||||
'';
|
||||
|
||||
|
|
4
third_party/tvl/ops/modules/clbot.nix
vendored
4
third_party/tvl/ops/modules/clbot.nix
vendored
|
@ -3,7 +3,7 @@
|
|||
|
||||
let
|
||||
inherit (builtins) attrValues concatStringsSep mapAttrs readFile;
|
||||
inherit (pkgs) runCommandNoCC;
|
||||
inherit (pkgs) runCommand;
|
||||
|
||||
inherit (lib)
|
||||
listToAttrs
|
||||
|
@ -21,7 +21,7 @@ let
|
|||
(attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags));
|
||||
|
||||
# Escapes a unit name for use in systemd
|
||||
systemdEscape = name: removeSuffix "\n" (readFile (runCommandNoCC "unit-name" { } ''
|
||||
systemdEscape = name: removeSuffix "\n" (readFile (runCommand "unit-name" { } ''
|
||||
${pkgs.systemd}/bin/systemd-escape '${name}' >> $out
|
||||
''));
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ let
|
|||
exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
|
||||
'';
|
||||
|
||||
gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" { } ''
|
||||
gerritHooks = pkgs.runCommand "gerrit-hooks" { } ''
|
||||
mkdir -p $out
|
||||
ln -s ${besadiiWithConfig "change-merged"} $out/change-merged
|
||||
ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created
|
||||
|
|
|
@ -13,7 +13,7 @@ let
|
|||
|
||||
# All Buildkite hooks are actually besadii, but it's being invoked
|
||||
# with different names.
|
||||
buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" { } ''
|
||||
buildkiteHooks = pkgs.runCommand "buildkite-hooks" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command
|
||||
'';
|
||||
|
|
2
third_party/tvl/ops/pipelines/depot.nix
vendored
2
third_party/tvl/ops/pipelines/depot.nix
vendored
|
@ -42,7 +42,7 @@ let
|
|||
|
||||
drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets;
|
||||
in
|
||||
pkgs.runCommandNoCC "depot-pipeline" { } ''
|
||||
pkgs.runCommand "depot-pipeline" { } ''
|
||||
mkdir $out
|
||||
cp -r ${pipeline}/* $out
|
||||
cp ${drvmap} $out/drvmap.json
|
||||
|
|
|
@ -7,9 +7,9 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (pkgs) bat runCommandNoCC;
|
||||
inherit (pkgs) bat runCommand;
|
||||
in
|
||||
runCommandNoCC "bat-syntaxes.bin" { } ''
|
||||
runCommand "bat-syntaxes.bin" { } ''
|
||||
export HOME=$PWD
|
||||
mkdir -p .config/bat/syntaxes
|
||||
cp ${./Prolog.sublime-syntax} .config/bat/syntaxes
|
||||
|
|
2
third_party/tvl/tvix/proto/default.nix
vendored
2
third_party/tvl/tvix/proto/default.nix
vendored
|
@ -3,7 +3,7 @@
|
|||
# anywhere, it just functions as a CI check for now.
|
||||
{ pkgs, ... }:
|
||||
|
||||
pkgs.runCommandNoCC "tvix-cc-proto" { } ''
|
||||
pkgs.runCommand "tvix-cc-proto" { } ''
|
||||
mkdir $out
|
||||
${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out
|
||||
''
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with pkgs.lib;
|
||||
|
||||
pkgs.runCommandNoCC "resume.pdf"
|
||||
pkgs.runCommand "resume.pdf"
|
||||
{
|
||||
buildInputs = [
|
||||
(pkgs.texlive.combine {
|
||||
|
|
|
@ -3,7 +3,7 @@ name: { plugins }: module_tf:
|
|||
|
||||
let
|
||||
|
||||
inherit (pkgs) lib runCommandNoCC writeText writeScript;
|
||||
inherit (pkgs) lib runCommand writeText writeScript;
|
||||
inherit (lib) filterAttrsRecursive;
|
||||
|
||||
allPlugins = (p: plugins p ++ (with p; [
|
||||
|
@ -38,7 +38,7 @@ let
|
|||
plugins = plugins_tf;
|
||||
};
|
||||
|
||||
module = runCommandNoCC "module" { } ''
|
||||
module = runCommand "module" { } ''
|
||||
mkdir $out
|
||||
${lib.concatStrings (lib.mapAttrsToList (k: config_tf:
|
||||
(let
|
||||
|
@ -72,7 +72,7 @@ let
|
|||
'';
|
||||
|
||||
# TODO: import (-config)
|
||||
tfcmds = runCommandNoCC "${name}-tfcmds" { } ''
|
||||
tfcmds = runCommand "${name}-tfcmds" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${init} $out/bin/init
|
||||
ln -s ${tfcmd} $out/bin/validate
|
||||
|
@ -95,7 +95,7 @@ in
|
|||
# destroy = depot.nix.nixRunWrapper "destroy" tfcmds;
|
||||
# };
|
||||
|
||||
test = runCommandNoCC "${name}-test" { } ''
|
||||
test = runCommand "${name}-test" { } ''
|
||||
set -e
|
||||
export TF_STATE_ROOT=$(pwd)
|
||||
${tfcmds}/bin/init
|
||||
|
|
|
@ -75,7 +75,7 @@ let
|
|||
]);
|
||||
in
|
||||
|
||||
pkgs.runCommandNoCC "html.nix.html"
|
||||
pkgs.runCommand "html.nix.html"
|
||||
{
|
||||
passAsFile = [ "exampleDocument" ];
|
||||
inherit exampleDocument;
|
||||
|
|
|
@ -56,7 +56,7 @@ let
|
|||
if !(drv ? cargoDeps.outPath)
|
||||
then null
|
||||
else
|
||||
pkgs.runCommandNoCC "${drv.name}-Cargo.lock" { } ''
|
||||
pkgs.runCommand "${drv.name}-Cargo.lock" { } ''
|
||||
if test -d "${drv.cargoDeps}"; then
|
||||
cp "${drv.cargoDeps}/Cargo.lock" "$out"
|
||||
fi
|
||||
|
|
2
third_party/tvl/users/tazjin/dns/default.nix
vendored
2
third_party/tvl/users/tazjin/dns/default.nix
vendored
|
@ -2,7 +2,7 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" { } ''
|
||||
checkZone = zone: file: pkgs.runCommand "${zone}-check" { } ''
|
||||
${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
|
||||
'';
|
||||
|
||||
|
|
4
third_party/tvl/web/atom-feed/default.nix
vendored
4
third_party/tvl/web/atom-feed/default.nix
vendored
|
@ -7,7 +7,7 @@ with depot.nix.yants;
|
|||
let
|
||||
inherit (builtins) foldl' map readFile replaceStrings sort;
|
||||
inherit (lib) concatStrings concatStringsSep max removeSuffix;
|
||||
inherit (pkgs) runCommandNoCC;
|
||||
inherit (pkgs) runCommand;
|
||||
|
||||
# 'link' describes a related link to a feed, or feed element.
|
||||
#
|
||||
|
@ -90,7 +90,7 @@ let
|
|||
|
||||
# Feed generation functions:
|
||||
|
||||
renderEpoch = epoch: removeSuffix "\n" (readFile (runCommandNoCC "date-${toString epoch}" { } ''
|
||||
renderEpoch = epoch: removeSuffix "\n" (readFile (runCommand "date-${toString epoch}" { } ''
|
||||
date --date='@${toString epoch}' --utc --iso-8601='seconds' > $out
|
||||
''));
|
||||
|
||||
|
|
4
third_party/tvl/web/blog/fragments.nix
vendored
4
third_party/tvl/web/blog/fragments.nix
vendored
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
inherit (builtins) filter map hasAttr replaceStrings;
|
||||
inherit (pkgs) runCommandNoCC writeText;
|
||||
inherit (pkgs) runCommand writeText;
|
||||
inherit (depot.nix) renderMarkdown;
|
||||
|
||||
staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}";
|
||||
|
@ -61,7 +61,7 @@ let
|
|||
<hr>
|
||||
'';
|
||||
|
||||
renderPost = { name, footer, ... }: post: runCommandNoCC "${post.key}.html" { } ''
|
||||
renderPost = { name, footer, ... }: post: runCommand "${post.key}.html" { } ''
|
||||
cat ${writeText "header.html" (header name post.title)} > $out
|
||||
|
||||
# Write the post title & date
|
||||
|
|
4
third_party/tvl/web/todolist/default.nix
vendored
4
third_party/tvl/web/todolist/default.nix
vendored
|
@ -8,7 +8,7 @@ let
|
|||
inherit (pkgs)
|
||||
jq
|
||||
ripgrep
|
||||
runCommandNoCC
|
||||
runCommand
|
||||
writeTextFile
|
||||
;
|
||||
|
||||
|
@ -39,7 +39,7 @@ let
|
|||
user = string;
|
||||
};
|
||||
|
||||
allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" { } ''
|
||||
allTodos = fromJSON (readFile (runCommand "depot-todos.json" { } ''
|
||||
${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \
|
||||
${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
|
||||
''));
|
||||
|
|
6
third_party/tvl/web/tvl/default.nix
vendored
6
third_party/tvl/web/tvl/default.nix
vendored
|
@ -4,7 +4,7 @@ with depot.nix.yants;
|
|||
|
||||
let
|
||||
inherit (builtins) filter;
|
||||
inherit (pkgs) graphviz runCommandNoCC writeText;
|
||||
inherit (pkgs) graphviz runCommand writeText;
|
||||
inherit (depot.web) atom-feed blog tvl;
|
||||
|
||||
listPosts = defun [ (list blog.post) string ] (posts:
|
||||
|
@ -16,7 +16,7 @@ let
|
|||
(map (p: "cp ${blog.renderPost tvl.blog.config p} $out/blog/${p.key}.html") posts)
|
||||
);
|
||||
|
||||
tvlGraph = runCommandNoCC "tvl.svg"
|
||||
tvlGraph = runCommand "tvl.svg"
|
||||
{
|
||||
nativeBuildInputs = with pkgs; [ fontconfig freetype cairo jetbrains-mono ];
|
||||
} ''
|
||||
|
@ -123,7 +123,7 @@ let
|
|||
'';
|
||||
};
|
||||
in
|
||||
runCommandNoCC "website" { } ''
|
||||
runCommand "website" { } ''
|
||||
mkdir -p $out/blog
|
||||
cp ${homepage} $out/index.html
|
||||
${postRenderingCommands tvl.blog.posts}
|
||||
|
|
2
third_party/tvl/web/tvl/logo/default.nix
vendored
2
third_party/tvl/web/tvl/logo/default.nix
vendored
|
@ -78,7 +78,7 @@ depot.nix.readTree.drvTargets (lib.fix (self: {
|
|||
logoSvg = style: pkgs.writeText "logo.svg" (logoSvg style);
|
||||
|
||||
# Create a PNG of the TVL logo with the specified style and DPI.
|
||||
logoPng = style: dpi: pkgs.runCommandNoCC "logo.png" { } ''
|
||||
logoPng = style: dpi: pkgs.runCommand "logo.png" { } ''
|
||||
${pkgs.inkscape}/bin/inkscape \
|
||||
--export-area-drawing \
|
||||
--export-background-opacity 0 \
|
||||
|
|
4
third_party/tvl/web/tvl/template/default.nix
vendored
4
third_party/tvl/web/tvl/template/default.nix
vendored
|
@ -14,11 +14,11 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
inherit (pkgs) runCommandNoCC lib;
|
||||
inherit (pkgs) runCommand lib;
|
||||
inherit (depot.tools) cheddar;
|
||||
in
|
||||
|
||||
runCommandNoCC "${lib.strings.sanitizeDerivationName title}-index.html"
|
||||
runCommand "${lib.strings.sanitizeDerivationName title}-index.html"
|
||||
{
|
||||
headerPart = ''
|
||||
<!DOCTYPE html>
|
||||
|
|
Loading…
Reference in a new issue