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
Download patch file Download diff file Expand all files Collapse all files

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}")"