about summary refs log tree commit diff
path: root/ci-builds.nix
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-08-04T17·43+0100
committertazjin <mail@tazj.in>2020-08-06T00·15+0000
commitd42c3dd72f3294f2a5af9bd66858d36aedce32a8 (patch)
tree8e2ca7ae5c8f4fc0e1f00a6864c7ce2a1d1869e3 /ci-builds.nix
parent68b5306c562c30df5ede227b451eadbf92c5c311 (diff)
chore(3p): Bump nixpkgs channels r/1604
Bumps both nixos-unstable and nixos-20.03 to today's versions, as per
status.nixos.org

Contains minor fixes to things that broke because of the update:

* tazjin/frog: hardware.u2f is a deprecated setting
* glittershark/system: modSha256 in Go modules is now vendorSha256
* glittershark/owothia: removed version constraint on relude

Change-Id: Ib3e9612b1b06ed547b90e4f8b0ffe5ed7fe0a5c4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1642
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'ci-builds.nix')
-rw-r--r--ci-builds.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci-builds.nix b/ci-builds.nix
index fe1d2c058cfb..f686bbf2441f 100644
--- a/ci-builds.nix
+++ b/ci-builds.nix
@@ -102,7 +102,9 @@ in lib.fix (self: {
     hgeometry-combinatorial
     vinyl
     comonad-extras
-    depot.third_party.haskell-language-server.ghc883
+
+    # TODO(grfn): Disabled because of build errors with recent nixpkgs
+    # depot.third_party.haskell-language-server.ghc883
   ];
 
   # User-specific build targets
@@ -116,7 +118,7 @@ in lib.fix (self: {
   ];
 
   glittershark = with depot.users.glittershark; [
-    xanthous
+    # xanthous
     keyboard.layout
     owothia