From 0c178a0ef61d2f5f4d6169c7a951663c62509cd7 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
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 <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>
---
 fun/gemma/default.nix      | 4 ++--
 fun/paroxysm/default.nix   | 2 +-
 fun/tvl-ebooks/default.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'fun')

diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix
index 4a26005852..f3fedad17b 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
     ''}/")
diff --git a/fun/paroxysm/default.nix b/fun/paroxysm/default.nix
index e4ce4df1ae..1aeaeb9912 100644
--- a/fun/paroxysm/default.nix
+++ b/fun/paroxysm/default.nix
@@ -7,7 +7,7 @@ depot.third_party.naersk.buildPackage {
 
   buildInputs = with pkgs; [
     openssl
-    pkgconfig
+    pkg-config
     postgresql.lib
     curl
   ];
diff --git a/fun/tvl-ebooks/default.nix b/fun/tvl-ebooks/default.nix
index fde6e05822..68e61c2525 100644
--- a/fun/tvl-ebooks/default.nix
+++ b/fun/tvl-ebooks/default.nix
@@ -2,6 +2,6 @@
 
 pkgs.buildGoModule {
   name = "tvl-ebooks";
-  vendorSha256 = "1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy";
+  vendorHash = "sha256:1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy";
   src = ./.;
 }
-- 
cgit 1.4.1