about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@tvl.su>2024-10-23T10·05+0300
committertazjin <tazjin@tvl.su>2024-10-27T00·17+0000
commit022cc423956379e755cd2a7e130cffa61e86cb74 (patch)
treee24d372716bda18d873a8ee96c30dd8ed61fe8b1 /users
parent0bc686448c30704f91f1cfaf7bcec8e69402d1b8 (diff)
chore(3p/sources): bump channels & overlays (2024-10-23) r/8860
* ops/modules: remove deprecated headscale DNS setting
* users/aspen: use stable julia again (upstream ticket is resolved, and 16 has
  been removed because it's long deprecated)
* users/wpcarro: utillinux -> util-linux
* 3p/overlays: temporarily restore utillinux until upstream breakage is fixed
* users/tazjin: noto-cjk -> noto-cjk-sans
* tvix: regenerate Go protobufs

Change-Id: I9dbec812306cd4e66030d14bbea3805e8224e0d5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12679
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: aspen <root@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'users')
-rw-r--r--users/aspen/system/home/modules/development.nix4
-rw-r--r--users/tazjin/nixos/frog/default.nix2
-rw-r--r--users/tazjin/nixos/modules/fonts.nix2
-rw-r--r--users/wpcarro/boilerplate/typescript/default.nix2
-rw-r--r--users/wpcarro/website/sandbox/contentful/default.nix2
5 files changed, 5 insertions, 7 deletions
diff --git a/users/aspen/system/home/modules/development.nix b/users/aspen/system/home/modules/development.nix
index ca6ef131a37f..0da6d9cbaf94 100644
--- a/users/aspen/system/home/modules/development.nix
+++ b/users/aspen/system/home/modules/development.nix
@@ -68,9 +68,7 @@ with lib;
 
     nodePackages.prettier
   ] ++ optionals (stdenv.isLinux) [
-    # TODO(aspen): replace with stable again once the current julia debacle
-    # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
-    julia_16-bin
+    julia-stable-bin
     valgrind
 
     linuxPackages.perf
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index ce82d749f408..226886bfba6c 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -109,7 +109,7 @@ lib.fix (self: {
       corefonts
       dejavu_fonts
       jetbrains-mono
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
     ];
 
diff --git a/users/tazjin/nixos/modules/fonts.nix b/users/tazjin/nixos/modules/fonts.nix
index 36b4cbe969ce..01ec118421c2 100644
--- a/users/tazjin/nixos/modules/fonts.nix
+++ b/users/tazjin/nixos/modules/fonts.nix
@@ -9,7 +9,7 @@
       dejavu_fonts
       font-awesome
       jetbrains-mono
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-color-emoji
       noto-fonts-monochrome-emoji
     ];
diff --git a/users/wpcarro/boilerplate/typescript/default.nix b/users/wpcarro/boilerplate/typescript/default.nix
index 84949cae7f3c..b013cf07eb44 100644
--- a/users/wpcarro/boilerplate/typescript/default.nix
+++ b/users/wpcarro/boilerplate/typescript/default.nix
@@ -6,7 +6,7 @@ pkgs.stdenv.mkDerivation {
   buildInputs = with pkgs; [
     nodejs
     # Exposes lscpu for parcel.js
-    utillinux
+    util-linux
   ];
   # parcel.js needs number of CPUs
   PARCEL_WORKERS = "1";
diff --git a/users/wpcarro/website/sandbox/contentful/default.nix b/users/wpcarro/website/sandbox/contentful/default.nix
index ce7e534b234b..8b3ed12c49a7 100644
--- a/users/wpcarro/website/sandbox/contentful/default.nix
+++ b/users/wpcarro/website/sandbox/contentful/default.nix
@@ -6,7 +6,7 @@ pkgs.stdenv.mkDerivation {
   buildInputs = with pkgs; [
     nodejs
     # Exposes lscpu for parcel.js
-    utillinux
+    util-linux
   ];
   # parcel.js needs number of CPUs
   PARCEL_WORKERS = "1";