mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays

Browse source 
Upstream nixpkgs removed a lot of aliases this time, so we needed to do
the following transformations. It's a real shame that aliases only
really become discoverable easily when they are removed.

* runCommandNoCC -> runCommand
* gmailieer -> lieer
  We also need to work around the fact that home-manager hasn't catched
  on to this rename.
* mysql -> mariadb
* pkgconfig -> pkg-config
  This also affects our Nix fork which needs to be bumped.
* prometheus_client -> prometheus-client
* rxvt_unicode -> rxvt-unicode-unwrapped
* nix-review -> nixpkgs-review
* oauth2_proxy -> oauth2-proxy

Additionally, some Go-related builders decided to drop support for
passing the sha256 hash in directly, so we need to use the generic hash
arguments.

Change-Id: I84aaa225ef18962937f8616a9ff064822f0d5dc3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6792
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
sterni 2022-09-26 19:33:05 +02:00
parent f40283e098
commit 0c178a0ef6
58 changed files with 100 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
corp/website/default.nix
View file

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

4
fun/gemma/default.nix
View file

@ -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
''}/")

2
fun/paroxysm/default.nix
View file

@ -7,7 +7,7 @@ depot.third_party.naersk.buildPackage {
buildInputs = with pkgs; [
openssl
pkgconfig
pkg-config
postgresql.lib
curl
];

2
fun/tvl-ebooks/default.nix
View file

@ -2,6 +2,6 @@
pkgs.buildGoModule {
name = "tvl-ebooks";
vendorSha256 = "1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy";
vendorHash = "sha256:1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy";
src = ./.;
}

2
net/alcoholic_jwt/default.nix
View file

@ -4,6 +4,6 @@ depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [
openssl
pkgconfig
pkg-config
];
}

2
net/crimp/default.nix
View file

@ -4,6 +4,6 @@ depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [
openssl
pkgconfig
pkg-config
];
}

10
nix/buildLisp/default.nix
View file

@ -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
nix/buildkite/default.nix
View file

@ -25,7 +25,7 @@ let
toJSON
unsafeDiscardStringContext;
inherit (pkgs) lib runCommandNoCC writeText;
inherit (pkgs) lib runCommand writeText;
inherit (depot.nix.readTree) mkLabel;
in
rec {
@ -225,7 +225,7 @@ rec {
phases;
in
runCommandNoCC "buildkite-pipeline" { } ''
runCommand "buildkite-pipeline" { } ''
mkdir $out
echo "Generated ${toString (length chunks)} pipeline chunks"
${

2
nix/renderMarkdown/default.nix
View file

@ -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
nix/sparseTree/default.nix
View file

@ -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
ops/dns/default.nix
View file

@ -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
'';

2
ops/journaldriver/default.nix
View file

@ -4,7 +4,7 @@ depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [
pkgconfig
pkg-config
openssl
systemd.dev
];

4
ops/modules/clbot.nix
View file

@ -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
''));

2
ops/modules/monorepo-gerrit.nix
View file

@ -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

2
ops/modules/oauth2_proxy.nix
View file

@ -53,7 +53,7 @@ in
RestartSec = "5s";
DynamicUser = true;
EnvironmentFile = cfg.secretsFile;
ExecStart = "${pkgs.oauth2_proxy}/bin/oauth2-proxy --config ${configFile}";
ExecStart = "${pkgs.oauth2-proxy}/bin/oauth2-proxy --config ${configFile}";
};
};
};

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

@ -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
ops/modules/tvl-users.nix
View file

@ -86,7 +86,7 @@
environment.systemPackages = with pkgs; [
alacritty.terminfo
foot.terminfo
rxvt_unicode.terminfo
rxvt-unicode-unwrapped.terminfo
# TODO(sterni): re-enable when the kitty build is fixed upstreams
# kitty.terminfo

2
ops/pipelines/depot.nix
View file

@ -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

4
third_party/bat_syntaxes/default.nix vendored
View file

@ -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/bufbuild/default.nix vendored
View file

@ -5,7 +5,7 @@
pkgs.buildGoModule {
pname = "buf";
version = "v0.20.1";
vendorSha256 = "1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs";
vendorHash = "sha256:1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs";
src = pkgs.fetchFromGitHub {
owner = "bufbuild";

2
third_party/buzz/default.nix vendored
View file

@ -9,7 +9,7 @@ depot.third_party.naersk.buildPackage {
};
buildInputs = with pkgs; [
pkgconfig
pkg-config
dbus
glib
openssl_1_1

2
third_party/gerrit-queue/default.nix vendored
View file

@ -3,7 +3,7 @@
pkgs.buildGoModule {
pname = "gerrit-queue";
version = "master";
vendorSha256 = "0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a";
vendorHash = "sha256:0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a";
src = ./.;
meta = with lib; {

2
third_party/irccat/default.nix vendored
View file

@ -5,7 +5,7 @@ pkgs.buildGoModule rec {
pname = "irccat";
version = "20201108";
meta.license = lib.licenses.gpl3;
vendorSha256 = "06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r";
vendorHash = "sha256:06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r";
src = pkgs.fetchFromGitHub {
owner = "irccloud";

2
third_party/josh/default.nix vendored
View file

@ -15,7 +15,7 @@ depot.third_party.naersk.buildPackage {
buildInputs = with pkgs; [
libgit2
openssl
pkgconfig
pkg-config
];
cargoBuildOptions = x: x ++ [

5
third_party/overlays/tvl.nix vendored
View file

@ -9,14 +9,15 @@ let
nixSrc =
let
# branch 2.3-backport-await-users
rev = "abdc60f49f1104696bac723331d3ed0296d5a784";
# XXX(tazjin): merge https://github.com/tvlfyi/nix/pull/3
rev = "22efe1ed25dff2fa15345a0f187e5ad450552599";
in
self.fetchFromGitHub
{
owner = "tvlfyi";
repo = "nix";
inherit rev;
hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy";
hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk";
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
in
{

2
third_party/prometheus-fail2ban-exporter/default.nix vendored
View file

@ -7,7 +7,7 @@ let
};
python = pkgs.python3.withPackages (p: [
p.prometheus_client
p.prometheus-client
]);
in

2
third_party/smtprelay/default.nix vendored
View file

@ -4,7 +4,7 @@
pkgs.buildGoModule rec {
pname = "smtprelay";
version = "1.7.0";
vendorSha256 = "00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn";
vendorHash = "sha256:00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn";
src = pkgs.fetchFromGitHub {
owner = "decke";

30
third_party/sources/sources.json vendored
View file

@ -5,10 +5,10 @@
"homepage": "https://matrix.to/#/#agenix:nixos.org",
"owner": "ryantm",
"repo": "agenix",
"rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e",
"sha256": "05b504v6jn8kk3ihfv5crisfqn9p7i1cbhrlqdj4h6gg5fyqzfms",
"rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0",
"sha256": "0k6aggy3lhqv6j11cvi4gr0i3jps8hlf262xl9ji3ffxwas46p54",
"type": "tarball",
"url": "https://github.com/ryantm/agenix/archive/c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e.tar.gz",
"url": "https://github.com/ryantm/agenix/archive/6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"emacs-overlay": {
@ -17,10 +17,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "6346fa5aa82fd663d340fe1e16e213128cad7542",
"sha256": "1yj28if5l4gg6h4sg3ffmdfarlnyqx09gqzspdxjvf2l18kli47a",
"rev": "117975b8082f22730778f9ad4529ff001b01b6cf",
"sha256": "0w8djx0z8h349ak0a1l7z7959bjfdkrardnpcdp31hlknff73azk",
"type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/6346fa5aa82fd663d340fe1e16e213128cad7542.tar.gz",
"url": "https://github.com/nix-community/emacs-overlay/archive/117975b8082f22730778f9ad4529ff001b01b6cf.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"impermanence": {
@ -53,10 +53,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340",
"sha256": "1wf0vgzfkpa1famz1fxx2758nm13k7dhkz1z8f4bgasmc2bxfckc",
"rev": "79d3ca08920364759c63fd3eb562e99c0c17044a",
"sha256": "1zz72k161yl9dxs5nxgy5p6nh8zsz4fbpclm99r12jw39zrlzhhw",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/d6490a0bd9dfb298fcd8382d3363b86870dc7340.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/79d3ca08920364759c63fd3eb562e99c0c17044a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-stable": {
@ -77,10 +77,10 @@
"homepage": "",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5",
"sha256": "152pw4a1vs4kiwfmncsc9d4zgd3v1li09adqm9ssq62jmxvzz217",
"rev": "e6c6adb0438a46baaf820d3f52ca587b44437d34",
"sha256": "0kcq4q8g5xc7iyj39523p1zkj5hjs403q1cykc78mcq4l20k702a",
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5.tar.gz",
"url": "https://github.com/oxalica/rust-overlay/archive/e6c6adb0438a46baaf820d3f52ca587b44437d34.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"rustsec-advisory-db": {
@ -89,10 +89,10 @@
"homepage": "https://rustsec.org",
"owner": "RustSec",
"repo": "advisory-db",
"rev": "a25cb0b593af26eeb7823a407163ec130028d62f",
"sha256": "19bc3qik3599nv1h89phq0k6miapgfvpkza3y52d80gnrn2zfma4",
"rev": "c83c210200de080c359cac76ea5abb9af003f4e4",
"sha256": "0lfhir3f1cr8bcik0fm1vq31vrlxbxwlm6ngq752650yyfxfw6rn",
"type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/a25cb0b593af26eeb7823a407163ec130028d62f.tar.gz",
"url": "https://github.com/RustSec/advisory-db/archive/c83c210200de080c359cac76ea5abb9af003f4e4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

4
third_party/terraform-provider-glesys/default.nix vendored
View file

@ -9,9 +9,9 @@ pkgs.terraform-providers.mkProvider rec {
owner = "glesys";
repo = "terraform-provider-glesys";
rev = "v${version}";
sha256 = "1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq";
hash = "sha256:1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq";
vendorSha256 = "0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw";
vendorHash = "sha256:0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw";
# This provider is not officially published in the TF registry, so
# we're giving it a fake source here.

2
tools/nixery/default.nix
View file

@ -72,7 +72,7 @@ depot.nix.readTree.drvTargets rec {
doCheck = true;
# Needs to be updated after every modification of go.mod/go.sum
vendorSha256 = "sha256-io9NCeZmjCZPLmII3ajXIsBWbT40XiW8ncXOuUDabbo=";
vendorHash = "sha256-io9NCeZmjCZPLmII3ajXIsBWbT40XiW8ncXOuUDabbo=";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${nixery-commit-hash}"

2
tvix/proto/default.nix
View file

@ -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
users/grfn/achilles/default.nix
View file

@ -17,7 +17,7 @@ depot.third_party.naersk.buildPackage {
ncurses
libxml2
libffi
pkgconfig
pkg-config
]);
doCheck = true;

2
users/grfn/pkgs/notmuch-extract-patch.nix
View file

@ -8,7 +8,7 @@ let
};
in
pkgs.runCommandNoCC "notmuch-extract-patch"
pkgs.runCommand "notmuch-extract-patch"
{
buildInputs = [ pkgs.python3 ];
} ''

2
users/grfn/resume/default.nix
View file

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

2
users/grfn/system/home/machines/ogopogo.nix
View file

@ -26,7 +26,7 @@ in
home.packages = with pkgs; [
zoom-us
slack
mysql
mariadb
graphviz
gnuplot
mypaint

2
users/grfn/system/home/machines/roswell.nix
View file

@ -36,7 +36,7 @@ in
# Nix things
nixfmt
nix-prefetch-github
nix-review
nixpkgs-review
cachix
# ReadySet stuff

2
users/grfn/system/home/machines/yeren.nix
View file

@ -26,7 +26,7 @@ in
home.packages = with pkgs; [
zoom-us
slack
mysql
mariadb
graphviz
gnuplot
mypaint

2
users/grfn/system/home/modules/common.nix
View file

@ -45,7 +45,7 @@
# Nix things
nixfmt
nix-prefetch-github
nix-review
nixpkgs-review
cachix
(writeShellScriptBin "rebuild-mugwump" ''
set -eo pipefail

2
users/grfn/system/home/modules/development.nix
View file

@ -22,7 +22,7 @@ let
sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm";
};
vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
vendorHash = "sha256:1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
};
in

2
users/grfn/system/home/modules/development/readyset.nix
View file

@ -22,7 +22,7 @@
sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
};
vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
})
awscli2

6
users/grfn/system/home/modules/email.nix
View file

@ -29,6 +29,10 @@ let
in
{
# 2022-09-26: workaround for home-manager defaulting to removed pkgs.gmailieer
# attribute, can likely be removed soon
programs.lieer.package = pkgs.lieer;
programs.lieer.enable = true;
programs.notmuch.enable = true;
services.lieer.enable = true;
@ -45,7 +49,7 @@ in
name = escapeUnitName "lieer-${name}";
value.Service = {
ExecStart = mkForce "${pkgs.writeShellScript "sync-${name}" ''
${pkgs.gmailieer}/bin/gmi sync --path ~/mail/${name}
${pkgs.lieer}/bin/gmi sync --path ~/mail/${name}
''}";
Environment = "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}";
};

8
users/grfn/terraform/workspace.nix
View file

@ -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

2
users/sterni/nix/html/tests/default.nix
View file

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

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

@ -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
users/tazjin/blog/default.nix
View file

@ -23,7 +23,7 @@ let
posts = filter includePost (list post (import ./posts.nix));
rendered = pkgs.runCommandNoCC "tazjins-blog" { } ''
rendered = pkgs.runCommand "tazjins-blog" { } ''
mkdir -p $out
${lib.concatStringsSep "\n" (map (post:

2
users/tazjin/dns/default.nix
View file

@ -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
'';

2
users/tazjin/emacs/default.nix
View file

@ -124,7 +124,7 @@ pkgs.makeOverridable
(kill-emacs 1))
'';
in
pkgs.runCommandNoCC "tdlibCheck" { } ''
pkgs.runCommand "tdlibCheck" { } ''
export PATH="${emacsBinPath}:$PATH"
${tgEmacs}/bin/emacs --script ${verifyTdlibVersion} && touch $out
'';

6
users/tazjin/homepage/default.nix
View file

@ -12,7 +12,7 @@ with nix.yants;
let
inherit (builtins) readFile replaceStrings sort;
inherit (pkgs) writeFile runCommandNoCC;
inherit (pkgs) writeFile runCommand;
# The different types of entries on the homepage.
entryClass = enum "entryClass" [ "blog" "project" "misc" ];
@ -35,7 +35,7 @@ let
date = post.date;
});
formatDate = defun [ int string ] (date: readFile (runCommandNoCC "date" { } ''
formatDate = defun [ int string ] (date: readFile (runCommand "date" { } ''
date --date='@${toString date}' '+%Y-%m-%d' > $out
''));
@ -68,7 +68,7 @@ let
homepage = index ((map postToEntry users.tazjin.blog.posts) ++ pageEntries);
atomFeed = import ./feed.nix (args // { inherit entry pageEntries; });
in
runCommandNoCC "website" { } ''
runCommand "website" { } ''
mkdir $out
cp ${homepage} $out/index.html
cp ${atomFeed} $out/feed.atom

2
users/tazjin/tgsa/default.nix
View file

@ -4,7 +4,7 @@ depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [
pkgconfig
pkg-config
openssl
];
}

6
users/wpcarro/website/blog/default.nix
View file

@ -17,7 +17,7 @@ let
posts = sort (x: y: x.date > y.date)
(filter includePost (list post (import ./posts.nix)));
rendered = pkgs.runCommandNoCC "blog-posts" { } ''
rendered = pkgs.runCommand "blog-posts" { } ''
mkdir -p $out
${lib.concatStringsSep "\n" (map (post:
@ -25,7 +25,7 @@ let
) posts)}
'';
formatDate = date: readFile (pkgs.runCommandNoCC "date" { } ''
formatDate = date: readFile (pkgs.runCommand "date" { } ''
date --date='@${toString date}' '+%B %e, %Y' > $out
'');
@ -39,7 +39,7 @@ let
postDate = formatDate post.date;
});
in
pkgs.runCommandNoCC "blog" { } ''
pkgs.runCommand "blog" { } ''
mkdir -p $out
cp ${withBrand (readFile postsHtml)} $out/index.html
cp -r ${rendered} $out/posts

2
users/wpcarro/website/default.nix
View file

@ -27,7 +27,7 @@ in
{
inherit domain renderTemplate withBrand;
root = pkgs.runCommandNoCC "wpcarro.dev" { } ''
root = pkgs.runCommand "wpcarro.dev" { } ''
mkdir -p $out
# /

4
web/atom-feed/default.nix
View file

@ -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
web/blog/fragments.nix
View file

@ -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

2
web/converse/default.nix
View file

@ -3,5 +3,5 @@
depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [ openssl postgresql.lib ];
nativeBuildInputs = [ pkgs.pkgconfig ];
nativeBuildInputs = [ pkgs.pkg-config ];
}

4
web/todolist/default.nix
View file

@ -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
web/tvl/default.nix
View file

@ -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
web/tvl/logo/default.nix
View file

@ -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
web/tvl/template/default.nix
View file

@ -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>