about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-12-25T10·13+0100
committertazjin <mail@tazj.in>2021-01-09T13·21+0000
commit88bf43878f243ca0276da4a21aa6a00a6a0dbc3c (patch)
treee946796ccccb079a5995a7eedbf46f41f383e11d /users
parent68c4730365a2874ee26d3cc92fbeb073de460a4b (diff)
chore(3p): Bump NixOS channels to 2020-12-28 r/2065
Changes:

* ops/nixos/tvl-slapd: The NixOS module for OpenLDAP has removed the
  ability to configure OpenLDAP directly and now forces users to use
  some kind of weird Nix->OLC mapping that is mostly undocumented.

  This moves the config we need to the new format in a way that may or
  may not work and does the other arbitrary dance steps that someone
  decided to impose on us. Note that this now throws lots of warnings,
  but I can't be bothered to fix them.

* 3p: Random package removals accomodated

* users/glittershark: Pin grfn's kernel to 5.9, because the CK patch
  is not yet updated for 5.10

* users/glittershark: Update vendor hash for pg-dump-upsert, I suspect
  this changed because of something in the Go build machinery in
  nixpkgs. The deleteVendor flag also has no effect anymore and has been
  removed.

* users/glittershark: agda build is broken, commenting out development
  home-manager environment until it can be fixed

* third_party/haskell_overlay: updating random needs upper boundarles
  of a few dependencies relaxed (curse them)

* third_party/gerrit_plugins: for some cursed reason the fixed-output
  hash of the gerrit owners plugin fetchgit changed, updated.
  Same for the checks plugin.

Change-Id: Ica37995fe8039d3ba80eab643867f98795c56734
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2295
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users')
-rw-r--r--users/glittershark/system/home/modules/development.nix4
-rw-r--r--users/glittershark/system/system/modules/kernel.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix
index cb69b808d2c7..cf7301cc60c2 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/glittershark/system/home/modules/development.nix
@@ -21,7 +21,6 @@ let
     };
 
     vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
-    deleteVendor = pkgs.stdenv.isLinux;
   };
 
 in
@@ -32,7 +31,8 @@ with lib;
   imports = [
     ./lib/zshFunctions.nix
     ./development/kube.nix
-    ./development/agda.nix
+    # TODO(grfn): agda build is broken in the nixpkgs checkout
+    # ./development/agda.nix
     ./development/rust.nix
   ];
 
diff --git a/users/glittershark/system/system/modules/kernel.nix b/users/glittershark/system/system/modules/kernel.nix
index dcde951b6152..7051231f3fcf 100644
--- a/users/glittershark/system/system/modules/kernel.nix
+++ b/users/glittershark/system/system/modules/kernel.nix
@@ -24,7 +24,7 @@ let
   };
 in
 {
-  boot.kernelPackages = pkgs.linuxPackages_latest.extend (self: super: {
+  boot.kernelPackages = pkgs.linuxPackages_5_9.extend (self: super: {
     kernel = super.kernel.override {
       ignoreConfigErrors = true;
       kernelPatches = super.kernel.kernelPatches ++ [{