about summary refs log tree commit diff
path: root/users/grfn
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-09-26T17·33+0200
committersterni <sternenseemann@systemli.org>2022-09-28T08·02+0000
commit0c178a0ef61d2f5f4d6169c7a951663c62509cd7 (patch)
tree08d4b97e5d423f9624211f92700e8bd1cf27fcbc /users/grfn
parentf40283e0985b5e16a7d67e018a16b0d52f09b90c (diff)
chore(3p/sources): Bump channels & overlays r/4980
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>
Diffstat (limited to 'users/grfn')
-rw-r--r--users/grfn/achilles/default.nix2
-rw-r--r--users/grfn/pkgs/notmuch-extract-patch.nix2
-rw-r--r--users/grfn/resume/default.nix2
-rw-r--r--users/grfn/system/home/machines/ogopogo.nix2
-rw-r--r--users/grfn/system/home/machines/roswell.nix2
-rw-r--r--users/grfn/system/home/machines/yeren.nix2
-rw-r--r--users/grfn/system/home/modules/common.nix2
-rw-r--r--users/grfn/system/home/modules/development.nix2
-rw-r--r--users/grfn/system/home/modules/development/readyset.nix2
-rw-r--r--users/grfn/system/home/modules/email.nix6
-rw-r--r--users/grfn/terraform/workspace.nix8
11 files changed, 18 insertions, 14 deletions
diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix
index 6dab0a5a62f7..714be6072881 100644
--- a/users/grfn/achilles/default.nix
+++ b/users/grfn/achilles/default.nix
@@ -17,7 +17,7 @@ depot.third_party.naersk.buildPackage {
     ncurses
     libxml2
     libffi
-    pkgconfig
+    pkg-config
   ]);
 
   doCheck = true;
diff --git a/users/grfn/pkgs/notmuch-extract-patch.nix b/users/grfn/pkgs/notmuch-extract-patch.nix
index 54dad260a041..7f00f925ec88 100644
--- a/users/grfn/pkgs/notmuch-extract-patch.nix
+++ b/users/grfn/pkgs/notmuch-extract-patch.nix
@@ -8,7 +8,7 @@ let
   };
 
 in
-pkgs.runCommandNoCC "notmuch-extract-patch"
+pkgs.runCommand "notmuch-extract-patch"
 {
   buildInputs = [ pkgs.python3 ];
 } ''
diff --git a/users/grfn/resume/default.nix b/users/grfn/resume/default.nix
index 21801ad9e7a8..4454e74c8261 100644
--- a/users/grfn/resume/default.nix
+++ b/users/grfn/resume/default.nix
@@ -2,7 +2,7 @@
 
 with pkgs.lib;
 
-pkgs.runCommandNoCC "resume.pdf"
+pkgs.runCommand "resume.pdf"
 {
   buildInputs = [
     (pkgs.texlive.combine {
diff --git a/users/grfn/system/home/machines/ogopogo.nix b/users/grfn/system/home/machines/ogopogo.nix
index e4144e79806e..d8150658a1ed 100644
--- a/users/grfn/system/home/machines/ogopogo.nix
+++ b/users/grfn/system/home/machines/ogopogo.nix
@@ -26,7 +26,7 @@ in
   home.packages = with pkgs; [
     zoom-us
     slack
-    mysql
+    mariadb
     graphviz
     gnuplot
     mypaint
diff --git a/users/grfn/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix
index a5a32fa5867f..135477b12ddf 100644
--- a/users/grfn/system/home/machines/roswell.nix
+++ b/users/grfn/system/home/machines/roswell.nix
@@ -36,7 +36,7 @@ in
     # Nix things
     nixfmt
     nix-prefetch-github
-    nix-review
+    nixpkgs-review
     cachix
 
     # ReadySet stuff
diff --git a/users/grfn/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix
index d1edaacc146c..6ffa02a57c6a 100644
--- a/users/grfn/system/home/machines/yeren.nix
+++ b/users/grfn/system/home/machines/yeren.nix
@@ -26,7 +26,7 @@ in
   home.packages = with pkgs; [
     zoom-us
     slack
-    mysql
+    mariadb
     graphviz
     gnuplot
     mypaint
diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix
index ce2f9788b835..ab0a2d925d2c 100644
--- a/users/grfn/system/home/modules/common.nix
+++ b/users/grfn/system/home/modules/common.nix
@@ -45,7 +45,7 @@
     # Nix things
     nixfmt
     nix-prefetch-github
-    nix-review
+    nixpkgs-review
     cachix
     (writeShellScriptBin "rebuild-mugwump" ''
       set -eo pipefail
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 3420fd652231..75af94bd4002 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -22,7 +22,7 @@ let
       sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm";
     };
 
-    vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
+    vendorHash = "sha256:1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
   };
 
 in
diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/grfn/system/home/modules/development/readyset.nix
index 4b6edb438039..5c566c1060dd 100644
--- a/users/grfn/system/home/modules/development/readyset.nix
+++ b/users/grfn/system/home/modules/development/readyset.nix
@@ -22,7 +22,7 @@
         sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
       };
 
-      vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
+      vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
     })
 
     awscli2
diff --git a/users/grfn/system/home/modules/email.nix b/users/grfn/system/home/modules/email.nix
index 4d5f3df69587..55dd70529b9b 100644
--- a/users/grfn/system/home/modules/email.nix
+++ b/users/grfn/system/home/modules/email.nix
@@ -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}";
       };
diff --git a/users/grfn/terraform/workspace.nix b/users/grfn/terraform/workspace.nix
index 92bf6e4ec1c5..114105642a3c 100644
--- a/users/grfn/terraform/workspace.nix
+++ b/users/grfn/terraform/workspace.nix
@@ -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