maurice/snix
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

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