about summary refs log tree commit diff
path: root/users/grfn/system
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-05-18T10·58+0300
committerclbot <clbot@tvl.fyi>2023-05-30T13·27+0000
commite3c5eb331315c9c252bf27e259ea98c6fb51003b (patch)
tree20de4090344bb2070727421fc19dde230b4e2fa0 /users/grfn/system
parent48b66a89820f170d89bb94a7a000bc8f73879aa4 (diff)
chore(3p/sources): bump nixpkgs channels & overlays r/6222
* 3p/buzz: delete package

  This is unused, old, and uses an insecure version of OpenSSL which
  broke eval.

* 3p/overlays: remove nvd patch

  Newer versions of nvd are compatible with Nix 2.3 by default.

* users/grfn/system/home: remove explicit rust-analyser package

  This conflicts with `rustup`, causing eval failures, as the wrapper
  seems to now be included in `rustup` by default.

* users/grfn/system: temporarily disable ISO builds

  They were broken upstream in nixpkgs by a change to stdenv/setup.sh,
  being fixed in https://github.com/NixOS/nixpkgs/pull/234883

Change-Id: I0eea99ec98f4e73e615c012ffae1d0e37122e73b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8585
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'users/grfn/system')
-rw-r--r--users/grfn/system/home/modules/development/rust.nix1
-rw-r--r--users/grfn/system/system/default.nix5
2 files changed, 4 insertions, 2 deletions
diff --git a/users/grfn/system/home/modules/development/rust.nix b/users/grfn/system/home/modules/development/rust.nix
index 153f99c8eec1..9ed42f5d2ddf 100644
--- a/users/grfn/system/home/modules/development/rust.nix
+++ b/users/grfn/system/home/modules/development/rust.nix
@@ -7,7 +7,6 @@ in
 
   home.packages = with pkgs; [
     rustup
-    rust-analyzer
     cargo-edit
     cargo-expand
     cargo-rr
diff --git a/users/grfn/system/system/default.nix b/users/grfn/system/system/default.nix
index ec3a002051e8..98b0fcf18e3c 100644
--- a/users/grfn/system/system/default.nix
+++ b/users/grfn/system/system/default.nix
@@ -30,7 +30,10 @@ rec {
 
   yerenSystem = (depot.ops.nixos.nixosFor yeren).system;
 
-  iso = import ./iso.nix args;
+  # TODO(grfn): reenable after
+  # https://github.com/NixOS/nixpkgs/pull/234883 has propagated
+  # through to our channel
+  # iso = import ./iso.nix args;
 
   meta.ci.targets = [
     "mugwumpSystem"