lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

treewide: fix things up for new nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2022-10-02 22:23:44 +01:00
parent 83d8a1b245
commit e03ae8b853
37 changed files with 59 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/authentik/pythonapp/default.nix
View file

@ -23,7 +23,7 @@ let
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ];
}); });
xmlsec = super.xmlsec.overridePythonAttrs (old: { 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 ]; buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ];
}); });
mistune = super.mistune.overridePythonAttrs (old: rec { mistune = super.mistune.overridePythonAttrs (old: rec {

4
nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix
View file

@ -2,7 +2,7 @@
# If you run pynixify again, the file will be either overwritten or # If you run pynixify again, the file will be either overwritten or
# deleted, and you will lose the changes you made to it. # 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 { buildPythonPackage rec {
pname = "celery-redbeat"; pname = "celery-redbeat";
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "030r39cmn2lfm1ysyvnya0ys63sfqwlk130qsdnndwjxpr0nk3fb"; sha256 = "030r39cmn2lfm1ysyvnya0ys63sfqwlk130qsdnndwjxpr0nk3fb";
}; };
propagatedBuildInputs = [ redis celery dateutil tenacity ]; propagatedBuildInputs = [ redis celery python-dateutil tenacity ];
# TODO FIXME # TODO FIXME
doCheck = false; doCheck = false;

4
nix/pkgs/baserow/backend/pynixify/packages/faker/default.nix
View file

@ -2,7 +2,7 @@
# If you run pynixify again, the file will be either overwritten or # If you run pynixify again, the file will be either overwritten or
# deleted, and you will lose the changes you made to it. # 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 { buildPythonPackage rec {
pname = "faker"; pname = "faker";
@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "14bqdb7wngxlr9n25syab6i7dr9xjkxlq0wy31aar8yxlffixs5r"; sha256 = "14bqdb7wngxlr9n25syab6i7dr9xjkxlq0wy31aar8yxlffixs5r";
}; };
propagatedBuildInputs = [ dateutil text-unidecode ]; propagatedBuildInputs = [ python-dateutil text-unidecode ];
# TODO FIXME # TODO FIXME
doCheck = false; doCheck = false;

2
nix/pkgs/hp-rom.nix
View file

@ -6,7 +6,7 @@ let
hash = "sha256:0h3i5jbqc40sxysq20l3ky0vxbn28avhm6fh6bv3bmar4lx1azcm"; hash = "sha256:0h3i5jbqc40sxysq20l3ky0vxbn28avhm6fh6bv3bmar4lx1azcm";
}; };
in in
pkgs.runCommandNoCC "hp-rom" { pkgs.runCommand "hp-rom" {
inherit bl465c; inherit bl465c;
nativeBuildInputs = [ nativeBuildInputs = [

4
nix/pkgs/prometheus-bird-exporter-lfty.nix
View file

@ -20,7 +20,5 @@ buildGoPackage rec {
passthru.tests = null; passthru.tests = null;
meta = prometheus-bird-exporter.meta // { inherit (prometheus-bird-exporter) meta;
url = "https://scm.linefinity.com/common/prometheus-bird-exporter-lfty";
};
} }

2
nix/pkgs/sheepshaver.nix
View file

@ -21,7 +21,7 @@ pkgs.stdenv.mkDerivation rec {
sourceRoot = "writable/SheepShaver/src/Unix"; sourceRoot = "writable/SheepShaver/src/Unix";
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
autoconf automake file perl pkgconfig autoconf automake file perl pkg-config
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [

4
ops/maint/update_nixpkgs/default.nix
View file

@ -4,7 +4,7 @@ let
mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: { mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: {
propagatedBuildInputs = [pkgs.python3Packages.hg-evolve]; propagatedBuildInputs = [pkgs.python3Packages.hg-evolve];
})); }));
updateNixpkgs = pkgs.runCommandNoCC "update_nixpkgs" { updateNixpkgs = pkgs.runCommand "update_nixpkgs" {
buildInputs = with pkgs; [ makeWrapper ]; buildInputs = with pkgs; [ makeWrapper ];
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
@ -27,7 +27,7 @@ pkgs.dockerTools.buildImage {
contents = [ contents = [
pkgs.cacert updateNixpkgs pkgs.cacert updateNixpkgs
(pkgs.runCommandNoCC "update_nixpkgs_content" {} '' (pkgs.runCommand "update_nixpkgs_content" {} ''
mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp
chmod 700 $out/root $out/root/.ssh chmod 700 $out/root $out/root/.ssh
chmod 1777 $out/tmp chmod 1777 $out/tmp

2
ops/nixos/bvm-heptapod/default.nix
View file

@ -179,7 +179,7 @@ in {
chmod -R u=rwX,go= /srv/gitlab-runner/.ssh chmod -R u=rwX,go= /srv/gitlab-runner/.ssh
''; '';
environment.systemPackages = with pkgs; [ 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 depot.nix.pkgs.heptapod-runner-mercurial
]; ];
}; };

2
ops/nixos/lib/common.nix
View file

@ -137,7 +137,7 @@ in
}; };
environment.systemPackages = with pkgs; [ 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 alacritty.terminfo kitty.terminfo
iftop htop jq iftop htop jq
depot.nix.pkgs.mercurial depot.nix.pkgs.mercurial

2
ops/nixos/lib/home-manager/common.nix
View file

@ -133,7 +133,7 @@ in
#!/bin/sh #!/bin/sh
exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@" 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 alacritty.terminfo kitty.terminfo
iftop htop jq iftop htop jq
depot.nix.pkgs.mercurial depot.nix.pkgs.mercurial

4
ops/nixos/lib/home-manager/graphical-client.nix
View file

@ -22,9 +22,9 @@
depot.nix.pkgs.lutris depot.nix.pkgs.lutris
pavucontrol pavucontrol
pngquant pngquant
rxvt_unicode rxvt-unicode
teamspeak_client teamspeak_client
virtmanager virt-manager
xclip xclip
xss-lock xss-lock
yubioath-desktop yubioath-desktop

2
ops/raritan/ssl-renew/default.nix
View file

@ -4,7 +4,7 @@
{ depot, pkgs, ... }: { depot, pkgs, ... }:
pkgs.runCommandNoCC "raritan-update" { pkgs.runCommand "raritan-update" {
inherit (pkgs) curl jq; inherit (pkgs) curl jq;
} '' } ''
mkdir $out mkdir $out

3
third_party/default.nix vendored
View file

@ -6,6 +6,7 @@
let let
nixpkgsConfig = { nixpkgsConfig = {
allowUnfree = true; allowUnfree = true;
checkMeta = false;
permittedInsecurePackages = [ permittedInsecurePackages = [
"p7zip-16.02" "p7zip-16.02"
]; ];
@ -36,7 +37,7 @@ let
sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
}; };
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; };
in in
rec { rec {
inherit nixpkgsConfig nixpkgs; inherit nixpkgsConfig nixpkgs;

2
third_party/tvl/corp/website/default.nix vendored
View file

@ -31,7 +31,7 @@ let
''; '';
}; };
in in
pkgs.runCommandNoCC "corp-website" { } '' pkgs.runCommand "corp-website" { } ''
mkdir $out mkdir $out
cp ${index} $out/index.html cp ${index} $out/index.html
'' ''

4
third_party/tvl/fun/gemma/default.nix vendored
View file

@ -1,7 +1,7 @@
{ depot, pkgs, ... }: { depot, pkgs, ... }:
let 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; elmPackages = depot.third_party.elmPackages_0_18;
frontend = stdenv.mkDerivation { frontend = stdenv.mkDerivation {
@ -28,7 +28,7 @@ let
injectFrontend = writeText "gemma-frontend.lisp" '' injectFrontend = writeText "gemma-frontend.lisp" ''
(in-package :gemma) (in-package :gemma)
(setq *static-file-location* "${runCommandNoCC "frontend" {} '' (setq *static-file-location* "${runCommand "frontend" {} ''
mkdir -p $out mkdir -p $out
cp ${frontend} $out/index.html cp ${frontend} $out/index.html
''}/") ''}/")

10
third_party/tvl/nix/buildLisp/default.nix vendored
View file

@ -8,7 +8,7 @@
let let
inherit (builtins) map elemAt match filter; 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; inherit (pkgs.stdenv) targetPlatform;
# #
@ -187,7 +187,7 @@ let
lispNativeDeps = allNative native lispDeps; lispNativeDeps = allNative native lispDeps;
filteredSrcs = implFilter implementation srcs; filteredSrcs = implFilter implementation srcs;
in in
runCommandNoCC name runCommand name
{ {
LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
LANG = "C.UTF-8"; LANG = "C.UTF-8";
@ -475,7 +475,7 @@ let
} $@ } $@
''; '';
bundled = name: runCommandNoCC "${name}-cllib" bundled = name: runCommand "${name}-cllib"
{ {
passthru = { passthru = {
lispName = name; lispName = name;
@ -640,7 +640,7 @@ let
} }
else null; else null;
in in
lib.fix (self: runCommandNoCC "${name}-cllib" lib.fix (self: runCommand "${name}-cllib"
{ {
LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
LANG = "C.UTF-8"; LANG = "C.UTF-8";
@ -707,7 +707,7 @@ let
} }
else null; else null;
in in
lib.fix (self: runCommandNoCC "${name}" lib.fix (self: runCommand "${name}"
{ {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
LD_LIBRARY_PATH = libPath; LD_LIBRARY_PATH = libPath;

4
third_party/tvl/nix/buildkite/default.nix vendored
View file

@ -28,7 +28,7 @@ let
toJSON toJSON
unsafeDiscardStringContext; unsafeDiscardStringContext;
inherit (pkgs) lib runCommandNoCC writeText; inherit (pkgs) lib runCommand writeText;
inherit (depot.nix.readTree) mkLabel; inherit (depot.nix.readTree) mkLabel;
in in
rec { rec {
@ -206,7 +206,7 @@ rec {
postBuildChunks = pipelineChunks "post" postSteps; postBuildChunks = pipelineChunks "post" postSteps;
chunks = buildChunks ++ postBuildChunks; chunks = buildChunks ++ postBuildChunks;
in in
runCommandNoCC "buildkite-pipeline" { } '' runCommand "buildkite-pipeline" { } ''
mkdir $out mkdir $out
echo "Generated ${toString (length chunks)} pipeline chunks" echo "Generated ${toString (length chunks)} pipeline chunks"
${ ${

2
third_party/tvl/nix/renderMarkdown/default.nix vendored
View file

@ -3,6 +3,6 @@
with depot.nix.yants; 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 cat ${file} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${file} > $out
'') '')

2
third_party/tvl/nix/sparseTree/default.nix vendored
View file

@ -64,7 +64,7 @@ in
# TODO(sterni): teach readTree to also read symlinked directories, # TODO(sterni): teach readTree to also read symlinked directories,
# so we ln -sT instead of cp -aT. # so we ln -sT instead of cp -aT.
pkgs.runCommandNoCC "sparse-${builtins.baseNameOf root}" { } ( pkgs.runCommand "sparse-${builtins.baseNameOf root}" { } (
lib.concatMapStrings lib.concatMapStrings
({ src, dst }: '' ({ src, dst }: ''
mkdir -p "$(dirname "$out${dst}")" mkdir -p "$(dirname "$out${dst}")"

2
third_party/tvl/ops/dns/default.nix vendored
View file

@ -2,7 +2,7 @@
{ depot, pkgs, ... }: { depot, pkgs, ... }:
let 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 ${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
''; '';

4
third_party/tvl/ops/modules/clbot.nix vendored
View file

@ -3,7 +3,7 @@
let let
inherit (builtins) attrValues concatStringsSep mapAttrs readFile; inherit (builtins) attrValues concatStringsSep mapAttrs readFile;
inherit (pkgs) runCommandNoCC; inherit (pkgs) runCommand;
inherit (lib) inherit (lib)
listToAttrs listToAttrs
@ -21,7 +21,7 @@ let
(attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags)); (attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags));
# Escapes a unit name for use in systemd # 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 ${pkgs.systemd}/bin/systemd-escape '${name}' >> $out
'')); ''));

2
third_party/tvl/ops/modules/monorepo-gerrit.nix vendored
View file

@ -9,7 +9,7 @@ let
exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@" exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
''; '';
gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" { } '' gerritHooks = pkgs.runCommand "gerrit-hooks" { } ''
mkdir -p $out mkdir -p $out
ln -s ${besadiiWithConfig "change-merged"} $out/change-merged ln -s ${besadiiWithConfig "change-merged"} $out/change-merged
ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created

2
third_party/tvl/ops/modules/tvl-buildkite.nix vendored
View file

@ -13,7 +13,7 @@ let
# All Buildkite hooks are actually besadii, but it's being invoked # All Buildkite hooks are actually besadii, but it's being invoked
# with different names. # with different names.
buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" { } '' buildkiteHooks = pkgs.runCommand "buildkite-hooks" { } ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command
''; '';

2
third_party/tvl/ops/pipelines/depot.nix vendored
View file

@ -42,7 +42,7 @@ let
drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets; drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets;
in in
pkgs.runCommandNoCC "depot-pipeline" { } '' pkgs.runCommand "depot-pipeline" { } ''
mkdir $out mkdir $out
cp -r ${pipeline}/* $out cp -r ${pipeline}/* $out
cp ${drvmap} $out/drvmap.json cp ${drvmap} $out/drvmap.json

4
third_party/tvl/third_party/bat_syntaxes/default.nix vendored
View file

@ -7,9 +7,9 @@
{ pkgs, ... }: { pkgs, ... }:
let let
inherit (pkgs) bat runCommandNoCC; inherit (pkgs) bat runCommand;
in in
runCommandNoCC "bat-syntaxes.bin" { } '' runCommand "bat-syntaxes.bin" { } ''
export HOME=$PWD export HOME=$PWD
mkdir -p .config/bat/syntaxes mkdir -p .config/bat/syntaxes
cp ${./Prolog.sublime-syntax} .config/bat/syntaxes cp ${./Prolog.sublime-syntax} .config/bat/syntaxes

2
third_party/tvl/tvix/proto/default.nix vendored
View file

@ -3,7 +3,7 @@
# anywhere, it just functions as a CI check for now. # anywhere, it just functions as a CI check for now.
{ pkgs, ... }: { pkgs, ... }:
pkgs.runCommandNoCC "tvix-cc-proto" { } '' pkgs.runCommand "tvix-cc-proto" { } ''
mkdir $out mkdir $out
${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out ${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out
'' ''

2
third_party/tvl/users/grfn/resume/default.nix vendored
View file

@ -2,7 +2,7 @@
with pkgs.lib; with pkgs.lib;
pkgs.runCommandNoCC "resume.pdf" pkgs.runCommand "resume.pdf"
{ {
buildInputs = [ buildInputs = [
(pkgs.texlive.combine { (pkgs.texlive.combine {

8
third_party/tvl/users/grfn/terraform/workspace.nix vendored
View file

@ -3,7 +3,7 @@ name: { plugins }: module_tf:
let let
inherit (pkgs) lib runCommandNoCC writeText writeScript; inherit (pkgs) lib runCommand writeText writeScript;
inherit (lib) filterAttrsRecursive; inherit (lib) filterAttrsRecursive;
allPlugins = (p: plugins p ++ (with p; [ allPlugins = (p: plugins p ++ (with p; [
@ -38,7 +38,7 @@ let
plugins = plugins_tf; plugins = plugins_tf;
}; };
module = runCommandNoCC "module" { } '' module = runCommand "module" { } ''
mkdir $out mkdir $out
${lib.concatStrings (lib.mapAttrsToList (k: config_tf: ${lib.concatStrings (lib.mapAttrsToList (k: config_tf:
(let (let
@ -72,7 +72,7 @@ let
''; '';
# TODO: import (-config) # TODO: import (-config)
tfcmds = runCommandNoCC "${name}-tfcmds" { } '' tfcmds = runCommand "${name}-tfcmds" { } ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${init} $out/bin/init ln -s ${init} $out/bin/init
ln -s ${tfcmd} $out/bin/validate ln -s ${tfcmd} $out/bin/validate
@ -95,7 +95,7 @@ in
# destroy = depot.nix.nixRunWrapper "destroy" tfcmds; # destroy = depot.nix.nixRunWrapper "destroy" tfcmds;
# }; # };
test = runCommandNoCC "${name}-test" { } '' test = runCommand "${name}-test" { } ''
set -e set -e
export TF_STATE_ROOT=$(pwd) export TF_STATE_ROOT=$(pwd)
${tfcmds}/bin/init ${tfcmds}/bin/init

2
third_party/tvl/users/sterni/nix/html/tests/default.nix vendored
View file

@ -75,7 +75,7 @@ let
]); ]);
in in
pkgs.runCommandNoCC "html.nix.html" pkgs.runCommand "html.nix.html"
{ {
passAsFile = [ "exampleDocument" ]; passAsFile = [ "exampleDocument" ];
inherit exampleDocument; inherit exampleDocument;

2
third_party/tvl/users/sterni/nixpkgs-crate-holes/default.nix vendored
View file

@ -56,7 +56,7 @@ let
if !(drv ? cargoDeps.outPath) if !(drv ? cargoDeps.outPath)
then null then null
else else
pkgs.runCommandNoCC "${drv.name}-Cargo.lock" { } '' pkgs.runCommand "${drv.name}-Cargo.lock" { } ''
if test -d "${drv.cargoDeps}"; then if test -d "${drv.cargoDeps}"; then
cp "${drv.cargoDeps}/Cargo.lock" "$out" cp "${drv.cargoDeps}/Cargo.lock" "$out"
fi fi

2
third_party/tvl/users/tazjin/dns/default.nix vendored
View file

@ -2,7 +2,7 @@
{ depot, pkgs, ... }: { depot, pkgs, ... }:
let 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 ${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
''; '';

4
third_party/tvl/web/atom-feed/default.nix vendored
View file

@ -7,7 +7,7 @@ with depot.nix.yants;
let let
inherit (builtins) foldl' map readFile replaceStrings sort; inherit (builtins) foldl' map readFile replaceStrings sort;
inherit (lib) concatStrings concatStringsSep max removeSuffix; inherit (lib) concatStrings concatStringsSep max removeSuffix;
inherit (pkgs) runCommandNoCC; inherit (pkgs) runCommand;
# 'link' describes a related link to a feed, or feed element. # 'link' describes a related link to a feed, or feed element.
# #
@ -90,7 +90,7 @@ let
# Feed generation functions: # 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 date --date='@${toString epoch}' --utc --iso-8601='seconds' > $out
'')); ''));

4
third_party/tvl/web/blog/fragments.nix vendored
View file

@ -8,7 +8,7 @@
let let
inherit (builtins) filter map hasAttr replaceStrings; inherit (builtins) filter map hasAttr replaceStrings;
inherit (pkgs) runCommandNoCC writeText; inherit (pkgs) runCommand writeText;
inherit (depot.nix) renderMarkdown; inherit (depot.nix) renderMarkdown;
staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}"; staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}";
@ -61,7 +61,7 @@ let
<hr> <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 cat ${writeText "header.html" (header name post.title)} > $out
# Write the post title & date # Write the post title & date

4
third_party/tvl/web/todolist/default.nix vendored
View file

@ -8,7 +8,7 @@ let
inherit (pkgs) inherit (pkgs)
jq jq
ripgrep ripgrep
runCommandNoCC runCommand
writeTextFile writeTextFile
; ;
@ -39,7 +39,7 @@ let
user = string; user = string;
}; };
allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" { } '' allTodos = fromJSON (readFile (runCommand "depot-todos.json" { } ''
${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \ ${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \
${jq}/bin/jq -s -f ${./extract-todos.jq} > $out ${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
'')); ''));

6
third_party/tvl/web/tvl/default.nix vendored
View file

@ -4,7 +4,7 @@ with depot.nix.yants;
let let
inherit (builtins) filter; inherit (builtins) filter;
inherit (pkgs) graphviz runCommandNoCC writeText; inherit (pkgs) graphviz runCommand writeText;
inherit (depot.web) atom-feed blog tvl; inherit (depot.web) atom-feed blog tvl;
listPosts = defun [ (list blog.post) string ] (posts: 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) (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 ]; nativeBuildInputs = with pkgs; [ fontconfig freetype cairo jetbrains-mono ];
} '' } ''
@ -123,7 +123,7 @@ let
''; '';
}; };
in in
runCommandNoCC "website" { } '' runCommand "website" { } ''
mkdir -p $out/blog mkdir -p $out/blog
cp ${homepage} $out/index.html cp ${homepage} $out/index.html
${postRenderingCommands tvl.blog.posts} ${postRenderingCommands tvl.blog.posts}

2
third_party/tvl/web/tvl/logo/default.nix vendored
View file

@ -78,7 +78,7 @@ depot.nix.readTree.drvTargets (lib.fix (self: {
logoSvg = style: pkgs.writeText "logo.svg" (logoSvg style); logoSvg = style: pkgs.writeText "logo.svg" (logoSvg style);
# Create a PNG of the TVL logo with the specified style and DPI. # 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 \ ${pkgs.inkscape}/bin/inkscape \
--export-area-drawing \ --export-area-drawing \
--export-background-opacity 0 \ --export-background-opacity 0 \

4
third_party/tvl/web/tvl/template/default.nix vendored
View file

@ -14,11 +14,11 @@
}@args: }@args:
let let
inherit (pkgs) runCommandNoCC lib; inherit (pkgs) runCommand lib;
inherit (depot.tools) cheddar; inherit (depot.tools) cheddar;
in in
runCommandNoCC "${lib.strings.sanitizeDerivationName title}-index.html" runCommand "${lib.strings.sanitizeDerivationName title}-index.html"
{ {
headerPart = '' headerPart = ''
<!DOCTYPE html> <!DOCTYPE html>