about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-12-25T11·22+0100
committersterni <sternenseemann@systemli.org>2021-12-25T21·58+0000
commit1f6a75c99af6cfc789ffdc84f3bdb4cd349939d2 (patch)
tree385a6d5d66b3374c4d91e0ab0fdfad03b5074209
parente9400403a555d99ece4028da4e46230ab6fb8c0b (diff)
chore(3p): bump NixOS channels to 2021-12-25 r/3404
* 3p/lisp/closer-mop: closer-mop no longer builds with ECL (see linked
  issue), so let's mark it as broken for now.

Change-Id: I97c29d718682cec4ecc682ff1593d0ce9aca0010
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4607
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r--third_party/lisp/closer-mop.nix4
-rw-r--r--third_party/nixpkgs/default.nix12
2 files changed, 10 insertions, 6 deletions
diff --git a/third_party/lisp/closer-mop.nix b/third_party/lisp/closer-mop.nix
index 145b9cfd4325..419772ba97c3 100644
--- a/third_party/lisp/closer-mop.nix
+++ b/third_party/lisp/closer-mop.nix
@@ -16,4 +16,8 @@ in depot.nix.buildLisp.library {
       ccl = "${src}/closer-clozure.lisp";
     }
   ];
+
+  brokenOn = [
+    "ecl" # https://github.com/pcostanza/closer-mop/issues/20
+  ];
 }
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 35687bc98713..872a7e79e88a 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -13,16 +13,16 @@ let
   # nixos-unstable, and the current stable channel of the latest NixOS
   # release.
 
-  # Tracking nixos-unstable as of 2021-12-20.
+  # Tracking nixos-unstable as of 2021-12-25.
   unstableHashes = {
-    commit = "d87b72206aadebe6722944f541f55d33fd7046fb";
-    sha256 = "18p03pdy2halapvlfv37f2p6m67g0y6lvhj485iyl4xa5hb4cr8n";
+    commit = "cb372c3b8880e504b06946e8fb2ca9777c685505";
+    sha256 = "0m5k2vkhdd3049pcrampw4xb7hvf9f44pp18y765fvdwwvgqasw7";
   };
 
-  # Tracking nixos-21.11 as of 2021-12-20.
+  # Tracking nixos-21.11 as of 2021-12-23.
   stableHashes = {
-    commit = "86453059bf8312f0f5bf1fe8a2f52da2be664489";
-    sha256 = "0inzy97dp5988cwjwpn41219rir4c7qp7wwg7v4abcs9lypg8is4";
+    commit = "1158f3463912d54cc981d61213839ec6c02570d3";
+    sha256 = "1v94p8mn3kw3yq79jhmrg0a7zam34v9pvx1sz534y737k2cwbx41";
   };
 
   # import the nixos-unstable package set, or optionally use the