From 0c178a0ef61d2f5f4d6169c7a951663c62509cd7 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 26 Sep 2022 19:33:05 +0200 Subject: chore(3p/sources): Bump channels & overlays 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 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: flokli Reviewed-by: tazjin Reviewed-by: wpcarro --- fun/gemma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fun/gemma') diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index 4a26005852f9..f3fedad17b01 100644 --- a/fun/gemma/default.nix +++ b/fun/gemma/default.nix @@ -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 ''}/") -- cgit 1.4.1